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 997, Wed Apr 27 17:33:05 2011 UTC revision 1171, Tue May 10 14:08:35 2011 UTC
# Line 20  Line 20 
20  sinclude(config/acx_pthread.m4)  sinclude(config/acx_pthread.m4)
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    sinclude(config/ax_check_framework.m4)
24    
25  dnl  dnl
26  dnl get host information  dnl get host information
# Line 28  Line 29 
29    
30  dnl check for standard programs  dnl check for standard programs
31  dnl  dnl
32    AC_PROG_CC([clang gcc cc])
33  AC_PROG_CPP  AC_PROG_CPP
34  AC_PROG_INSTALL  AC_PROG_INSTALL
35  AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
# Line 41  Line 43 
43    
44  dnl extra C compiler options  dnl extra C compiler options
45  dnl  dnl
46  CC="$CC -m64"  CFLAG_M64="-m64"
47  CFLAGS="$CFLAGS -Wformat -Wreturn-type -Wuninitialized"  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"
48    AC_SUBST(CFLAG_M64)
49    AC_SUBST(CFLAGS_BASE)
50    
51  dnl  dnl
52  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
53  dnl  dnl
54  AC_MSG_CHECKING([for CUDA and nvcc])  AC_MSG_NOTICE([checking for CUDA and nvcc])
55  AC_PATH_PROG(NVCC, nvcc, ":", $PATH)  AC_PATH_PROG(NVCC, nvcc, no, $PATH)
56  if test $NVCC = none ; then  if test x"$NVCC" = xno ; then
57    AC_MSG_WARN([nvcc not found])    AC_MSG_WARN([nvcc not found])
58      CUDA_ENABLED=false
59      NVCC=":"
60  else  else
61    AC_MSG_RESULT([$NVCC])    AC_MSG_RESULT([$NVCC])
62      CUDA_ENABLED=true
63  fi  fi
64  AC_SUBST(NVCC)  AC_SUBST(NVCC)
65    AC_SUBST(CUDA_ENABLED)
66    
67    dnl
68    dnl check for OpenCL support
69    dnl
70    OPENCL_LIBS="none"
71    case "$host_os" in
72      darwin*) # On Mac OS X we check for installed frameworks
73        AX_CHECK_FRAMEWORK([OpenCL], [OPENCL_LIBS="-framework OpenCL"], [])
74      ;;
75      *)
76        AC_CHECK_LIB([OpenCL],[clGetPlatformIDs],[OPENCL_LIBS="-lOpenCL"])
77      ;;
78    esac
79    if test x"$OPENCL_LIBS" = xnone ; then
80      AC_MSG_WARN([no OpenCL library found])
81      OPENCL_ENABLED=false
82    else
83      OPENCL_ENABLED=true
84      AC_SUBST(OPENCL_LIBS)
85    fi
86    AC_SUBST(OPENCL_ENABLED)
87    
88  dnl  dnl
89  dnl check for pthreads support  dnl check for pthreads support
# Line 79  Line 108 
108        HAS_FINK=no        HAS_FINK=no
109      fi      fi
110    ;;    ;;
111    linux) # On Linux we include the -rpath option to pick up dynamically-loaded libraries    linux*) # On Linux we include the -rpath option to pick up dynamically-loaded libraries
112      LD_NEEDS_RPATH=true      LD_NEEDS_RPATH=true
113      LIBM="-lm"      LIBM="-lm"
114    ;;    ;;
# Line 195  Line 224 
224    src/dnorm/Makefile    src/dnorm/Makefile
225    src/compiler/Makefile    src/compiler/Makefile
226    src/lib/Makefile    src/lib/Makefile
227    test/Makefile    src/lib/build/Makefile
228      src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
229    test/MIP/Makefile    test/MIP/Makefile
230    test/probe/Makefile    test/probe/Makefile
231  dnl  dnl
232    dnl ***** CM files *****
233      src/compiler/codegen/sources.cm:src/compiler/codegen/sources_cm.in
234    dnl
235  dnl ***** SML source files *****  dnl ***** SML source files *****
236    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in
237    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
# Line 211  Line 244 
244    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
245  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
246    
247    dnl
248    dnl generate makefiles for runtime library builds
249    dnl
250    dnl usage: MK_BUILD_DIR(<build-dir>, <target-platform>, <options>)
251    dnl
252    AC_DEFUN([MK_BUILD_DIR], [
253        if test ! -d src/lib/build/$1 ; then
254          mkdir src/lib/build/$1
255        fi
256        [sed -e 's,@BUILD_TARGET@,$1,g' \
257          -e 's,@TARGET_PLATFORM@,$2,g' \
258          -e 's,@BUILD_OPTIONS@,$3,g' \
259          src/lib/build/mk/Makefile.in \
260            > src/lib/build/$1/Makefile.in]
261        AC_CONFIG_FILES(src/lib/build/$1/Makefile)
262      ])
263    
264    MK_BUILD_DIR(rt-c-f, c-target, [float])
265    MK_BUILD_DIR(rt-c-f-debug, c-target, [float debug])
266    
267  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.997  
changed lines
  Added in v.1171

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