Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/pure-cfg/configure.ac
ViewVC logotype

Diff of /branches/pure-cfg/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 679, Wed Mar 23 23:31:12 2011 UTC revision 1158, Mon May 9 16:11:27 2011 UTC
# Line 21  Line 21 
21  sinclude(config/check_smlnj.m4)  sinclude(config/check_smlnj.m4)
22  sinclude(config/check_smlnj_heap_suffix.m4)  sinclude(config/check_smlnj_heap_suffix.m4)
23    
   
24  dnl  dnl
25  dnl get host information  dnl get host information
26  dnl  dnl
# Line 42  Line 41 
41    
42  dnl extra C compiler options  dnl extra C compiler options
43  dnl  dnl
44  CC="$CC -m64"  CFLAG_M64="-m64"
45  CFLAGS="$CFLAGS -Wformat -Wreturn-type -Wuninitialized"  CFLAGS="$CFLAGS -Wformat -Wreturn-type -Wuninitialized"
46    AC_SUBST(CFLAG_M64)
47    
48  dnl  dnl
49  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
# Line 58  Line 58 
58  AC_SUBST(NVCC)  AC_SUBST(NVCC)
59    
60  dnl  dnl
61  dnl If we are on Mac OS X, check for the presence of macports and/or fink  dnl check for pthreads support
62    dnl
63    ACX_PTHREAD()
64    
65  dnl  dnl
66    dnl OS-specific linking issues
67    dnl
68    LD_NEEDS_RPATH=false;
69    LIBM=""
70  case "$host_os" in  case "$host_os" in
71    darwin*) # On Mac OS X we check for installed frameworks    darwin*) # On Mac OS X we check for the presence of macports and/or fink
72      if test -x /opt/local/bin/port ; then      if test -x /opt/local/bin/port ; then
73        HAS_MACPORTS=yes        HAS_MACPORTS=yes
74      else      else
# Line 73  Line 80 
80        HAS_FINK=no        HAS_FINK=no
81      fi      fi
82    ;;    ;;
83      linux*) # On Linux we include the -rpath option to pick up dynamically-loaded libraries
84        LD_NEEDS_RPATH=true
85        LIBM="-lm"
86      ;;
87  esac  esac
88    
89  if test x"$HAS_MACPORTS" = xyes ; then  if test x"$HAS_MACPORTS" = xyes ; then
# Line 83  Line 94 
94    LDPATHS=""    LDPATHS=""
95  fi  fi
96  AC_SUBST(LDPATHS)  AC_SUBST(LDPATHS)
97    AC_SUBST(LD_NEEDS_RPATH)
98    AC_SUBST(LIBM)
99    
100  dnl  dnl
101  dnl get the path to the TEEM installation  dnl get the path to the TEEM installation
# Line 183  Line 196 
196    src/dnorm/Makefile    src/dnorm/Makefile
197    src/compiler/Makefile    src/compiler/Makefile
198    src/lib/Makefile    src/lib/Makefile
199    test/Makefile    src/lib/build/Makefile
200      src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
201    test/MIP/Makefile    test/MIP/Makefile
202    test/probe/Makefile    test/probe/Makefile
203  dnl  dnl
# Line 199  Line 213 
213    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
214  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
215    
216    dnl
217    dnl generate makefiles for runtime library builds
218    dnl
219    dnl usage: MK_BUILD_DIR(<build-dir>, <target-platform>, <options>)
220    dnl
221    AC_DEFUN([MK_BUILD_DIR], [
222        if test ! -d src/lib/build/$1 ; then
223          mkdir src/lib/build/$1
224        fi
225        [sed -e 's,@BUILD_TARGET@,$1,g' \
226          -e 's,@TARGET_PLATFORM@,$2,g' \
227          -e 's,@BUILD_OPTIONS@,$3,g' \
228          src/lib/build/mk/Makefile.in \
229            > src/lib/build/$1/Makefile.in]
230        AC_CONFIG_FILES(src/lib/build/$1/Makefile)
231      ])
232    
233    MK_BUILD_DIR(rt-c-f, c-target, [float])
234    MK_BUILD_DIR(rt-c-f-debug, c-target, [float debug])
235    
236  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.679  
changed lines
  Added in v.1158

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0