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

SCM Repository

[diderot] Diff of /branches/vis15/configure.ac
ViewVC logotype

Diff of /branches/vis15/configure.ac

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

revision 3715, Sat Apr 2 17:23:54 2016 UTC revision 4849, Wed Dec 21 17:25:30 2016 UTC
# Line 2  Line 2 
2  dnl  dnl
3  dnl This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)  dnl This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
4  dnl  dnl
5  dnl COPYRIGHT (c) 2015 The University of Chicago  dnl COPYRIGHT (c) 2016 The University of Chicago
6  dnl All rights reserved.  dnl All rights reserved.
7  dnl  dnl
8    
9  AC_INIT(diderot,1.0,)  AC_INIT(diderot,2.0,)
10    
11  AC_PREREQ(2.60)  AC_PREREQ(2.60)
12  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])  AC_COPYRIGHT([[COPYRIGHT (c) 2016 The University of Chicago]])
13  AC_CONFIG_SRCDIR(src/compiler/options/ctl.sml)  AC_CONFIG_SRCDIR(src/compiler/options/ctl.sml)
14  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
15  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
# Line 17  Line 17 
17  dnl  dnl
18  dnl set the following to the name of the branch  dnl set the following to the name of the branch
19  dnl  dnl
20  BRANCH="master"  BRANCH="vis15"
21  AC_SUBST(BRANCH)  AC_SUBST(BRANCH)
22    
23  dnl  dnl
24  dnl include additional macros  dnl include additional macros
25  dnl  dnl
26    sinclude(config/ax_check_compile_flag.m4)
27    sinclude(config/ax_gcc_x86_cpuid.m4)
28    sinclude(config/ax_gcc_x86_avx_xgetbv.m4)
29    sinclude(config/ax_ext.m4)
30  sinclude(config/acx_pthread.m4)  sinclude(config/acx_pthread.m4)
31  sinclude(config/check_smlnj.m4)  sinclude(config/check_smlnj.m4)
32  sinclude(config/check_smlnj_heap_suffix.m4)  sinclude(config/check_smlnj_heap_suffix.m4)
33  sinclude(config/ax_check_framework.m4)  sinclude(config/ax_check_framework.m4)
34    sinclude(config/ax_cxx_compile_stdcxx.m4)
35    
36  dnl  dnl
37  dnl get host information  dnl get host information
38  dnl  dnl
39  AC_CANONICAL_HOST  AC_CANONICAL_HOST
40    
41    #################### Paths configuration ####################
42    
43    DIDEROT_ROOT=`pwd`
44    DIDEROT_DOCDIR=$DIDEROT_ROOT/doc
45    DIDEROT_SRCDIR=$DIDEROT_ROOT/src
46    DIDEROT_LIBDIR=$DIDEROT_ROOT/lib
47    DIDEROT_BINDIR=$DIDEROT_ROOT/bin
48    DIDEROT_MKDIR=$DIDEROT_ROOT/mk
49    
50    AC_SUBST(DIDEROT_ROOT)
51    AC_SUBST(DIDEROT_DOCDIR)
52    AC_SUBST(DIDEROT_SRCDIR)
53    AC_SUBST(DIDEROT_LIBDIR)
54    AC_SUBST(DIDEROT_BINDIR)
55    AC_SUBST(DIDEROT_MKDIR)
56    
57    #################### end Paths configuration ####################
58    
59  dnl check for standard programs  dnl check for standard programs
60  dnl  dnl
 AC_PROG_CC([clang gcc cc])  
61  AC_PROG_CPP  AC_PROG_CPP
62    AC_PROG_CC([clang gcc cc])
63    AC_PROG_CXX([clang++ g++ c++])
64    AX_CXX_COMPILE_STDCXX(11,[],[mandatory])
65  AC_PROG_INSTALL  AC_PROG_INSTALL
66  AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
67    
# Line 48  Line 73 
73  fi  fi
74  AC_SUBST(LD)  AC_SUBST(LD)
75    
76  dnl check for c99 support  dnl extra compiler options
77  dnl  dnl
78  AC_PROG_CC_C99  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"
79  if test x"$ac_cv_prog_cc_c99" = xno ; then  
80    AC_MSG_ERROR([Diderot requires c99 support])  dnl check for SIMD support
81  fi  dnl
82    AX_EXT
83    
84  AC_ARG_ENABLE([32-bit],  AC_ARG_ENABLE([32-bit],
85    AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),    AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),
86    [CFLAG_MXX="-m32"],    [CXXFLAG_Mxx="-m32"],
87    [CFLAG_MXX="-m64"])    [CXXFLAG_Mxx="-m64"])
88    
89    CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"
90    AC_SUBST(CXXFLAG_Mxx)
91    AC_SUBST(CXXFLAGS_BASE)
92    
93    dnl
94    dnl run the compiler tests in 64-bit mode
95    dnl
96    save_CFLAGS=$CFLAGS
97    CFLAGS="$CFLAGS $CFLAG_MXX"
98    
99    dnl
100    dnl check for gcc builtin atomic operations
101    dnl
102    AC_MSG_CHECKING([for builtin atomic operations])
103    AC_LINK_IFELSE(
104       [AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);])],
105       AC_MSG_RESULT(yes)
106       AC_DEFINE(
107        [HAVE_BUILTIN_ATOMIC_OPS], 1,
108        [Define to 1 if gcc compiler provides atomic operations.]),
109       AC_MSG_RESULT(no))
110    
111    AC_C_BIGENDIAN
112    
113    #
114    # determine the sizes of the standard C types
115    AC_CHECK_SIZEOF([int])
116    SIZEOF_C_INT=$ac_cv_sizeof_int
117    AC_CHECK_SIZEOF([long])
118    SIZEOF_C_LONG=$ac_cv_sizeof_long
119    AC_CHECK_SIZEOF([float])
120    SIZEOF_C_FLOAT=$ac_cv_sizeof_float
121    AC_CHECK_SIZEOF([double])
122    SIZEOF_C_DOUBLE=$ac_cv_sizeof_double
123    
124    AC_SUBST(SIZEOF_C_INT)
125    AC_SUBST(SIZEOF_C_LONG)
126    AC_SUBST(SIZEOF_C_FLOAT)
127    AC_SUBST(SIZEOF_C_DOUBLE)
128    
 dnl extra C compiler options  
129  dnl  dnl
130  CFLAGS=""  dnl restore CFLAGS
131  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"  dnl
132  AC_SUBST(CFLAG_MXX)  CFLAGS=$save_CFLAGS
 AC_SUBST(CFLAGS_BASE)  
133    
134  dnl  dnl
135  dnl standard headers  dnl check for <stdbool.h>, which we use in the C API
136  dnl  dnl
137  AC_HEADER_STDBOOL  AC_HEADER_STDBOOL
138    
139  dnl  dnl
140    dnl the C boolean type to use in generated library headers
141    dnl
142    if test x"$ac_cv_header_stdbool_h" = xyes ; then
143      BOOLTY="bool"
144    elif test "x$ac_cv_type__Bool" = xyes; then
145      BOOLTY="_Bool"
146    else
147      BOOLTY="int"
148    fi
149    AC_SUBST(BOOLTY)
150    
151    dnl
152  dnl check for pthreads support  dnl check for pthreads support
153  dnl  dnl
154  ACX_PTHREAD  ACX_PTHREAD
155    
156  dnl  dnl
157    dnl check for various library routines etc.
158    dnl
159    AC_CHECK_FUNCS(posix_memalign)
160    if test x"$ac_cv_func_posix_memalign" != xyes ; then
161      AC_CHECK_FUNCS(memalign)
162      if test x"$ac_cv_func_posix_memalign" != xyes ; then
163        AC_CHECK_FUNCS(valloc)
164      fi
165    fi
166    
167    AC_CHECK_FUNCS(mach_absolute_time)
168    AC_CHECK_TYPES([struct timespec])
169    AC_CHECK_FUNCS(pthread_barrier_init)
170    
171    dnl
172    dnl check for clock_gettime.  On Linux, this requires librt.
173    dnl
174    save_LIBS=$LIBS
175    LIBS="-lrt $LIBS"
176    AC_MSG_CHECKING([for clock_gettime])
177    AC_LINK_IFELSE(
178      [AC_LANG_PROGRAM(
179        [[#include <time.h>]],
180        [[struct timespec t; clock_gettime(CLOCK_REALTIME, &t); ]])],
181      [ ac_cv_func_clock_gettime=yes;
182        AC_DEFINE(HAVE_CLOCK_GETTIME, [1], [is clock_gettime available?])],
183      [ac_cv_func_clock_gettime=no])
184    AC_MSG_RESULT($ac_cv_func_clock_gettime)
185    if test "$ac_cv_func_clock_gettime" = "no" ; then
186      LIBS=$save_LIBS
187    fi
188    
189    AC_CHECK_FUNCS(pthread_getcpuclockid)
190    AC_CHECK_FUNCS(sigtimedwait nanosleep)
191    
192    dnl
193    dnl check for sched_setaffinity
194    dnl
195    AC_CHECK_FUNCS(sched_setaffinity)
196    
197    dnl
198    dnl check for pthread_setaffinity_np
199    dnl
200    save_LIBS=$LIBS
201    save_CFLAGS=$CFLAGS
202    LIBS="$PTHREAD_LIBS $LIBS"
203    CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
204    AC_MSG_CHECKING([for pthread_setaffinity_np])
205    AC_LINK_IFELSE(
206      [AC_LANG_PROGRAM(
207        [[#include <pthread.h>]],
208        [[cpu_set_t s; pthread_setaffinity_np(pthread_self(), sizeof(s), &s); ]])],
209      [ ac_cv_func_pthread_setaffinity_np=yes;
210        AC_DEFINE(HAVE_PTHREAD_SETAFFINITY_NP, [1], [is pthread_setaffinity_np available?])],
211      [ac_cv_func_pthread_setaffinity_np=no])
212    AC_MSG_RESULT($ac_cv_func_pthread_setaffinity_np)
213    LIBS=$save_LIBS
214    CFLAGS=$save_CFLAGS
215    
216    dnl
217    dnl check for Linux NUMA support (libnuma)
218    dnl
219    AC_CHECK_LIB(numa,numa_available)
220    if test "$ac_cv_lib_numa_numa_available" = "yes" ; then
221      PTHREAD_LIBS="$PTHREAD_LIBS -lnuma"
222    fi
223    
224    dnl check for /proc/cpuinfo
225    dnl
226    AC_CHECK_FILES(/proc/cpuinfo)
227    
228    dnl
229    dnl OS-specific linking issues
230    dnl
231    LD_NEEDS_RPATH=false;
232    LIBM=""
233    case "$host_os" in
234      darwin*) # On Mac OS X we check for the presence of macports and/or fink
235        if test -x /opt/local/bin/port ; then
236          HAS_MACPORTS=yes
237        else
238          HAS_MACPORTS=no
239        fi
240        if test -x /sw/bin/fink ; then
241          HAS_FINK=yes
242        else
243          HAS_FINK=no
244        fi
245      ;;
246      linux*) # On Linux we include the -rpath option to pick up dynamically-loaded libraries
247        LD_NEEDS_RPATH=true
248        LIBM="-lm"
249      ;;
250    esac
251    
252    if test x"$HAS_MACPORTS" = xyes ; then
253      LDPATHS="-L/opt/local/lib"
254    elif test x"$HAS_FINK" = xyes ; then
255      LDPATHS="-L/sw/lib"
256    else
257      LDPATHS=""
258    fi
259    AC_SUBST(LDPATHS)
260    AC_SUBST(LD_NEEDS_RPATH)
261    AC_SUBST(LIBM)
262    
263    #################### Logging configuration ####################
264    
265    LOGGING_ENABLED=false
266    AC_ARG_ENABLE([event-logging],
267      AC_HELP_STRING([--enable-event-logging], [include event-logging support for parallel target]),
268      [LOGGING_ENABLED=true],
269      [LOGGING_ENABLED=false])
270    
271    AC_SUBST(LOGGING_ENABLED)
272    
273    #################### end Logging configuration ####################
274    
275    #################### CUDA configuration ####################
276    
277    AC_ARG_ENABLE([cuda],
278      AC_HELP_STRING([--enable-cuda], [include support for targeting CUDA]))
279    
280    if test "${enable_cuda+set}" = set ; then
281    dnl
282  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
283  dnl  dnl
284  AC_MSG_NOTICE([checking for CUDA and nvcc])  AC_MSG_NOTICE([checking for CUDA and nvcc])
# Line 90  Line 291 
291    AC_MSG_RESULT([$NVCC])    AC_MSG_RESULT([$NVCC])
292    CUDA_ENABLED=true    CUDA_ENABLED=true
293  fi  fi
294    else
295      NVCC=":"
296      CUDA_ENABLED=false
297    fi
298  AC_SUBST(NVCC)  AC_SUBST(NVCC)
299  AC_SUBST(CUDA_ENABLED)  AC_SUBST(CUDA_ENABLED)
300    
301    #################### end CUDA configuration ####################
302    
303    #################### OpenCL configuration ####################
304    
305    AC_ARG_ENABLE([opencl],
306      AC_HELP_STRING([--enable-opencl], [include support for targeting OpenCL]))
307    
308    if test "${enable_opencl+set}" = set ; then
309    
310  dnl  dnl
311  dnl check for OpenCL support  dnl check for OpenCL support
312  dnl  dnl
# Line 211  Line 425 
425    SIZEOF_CL_DOUBLE=$ac_cv_sizeof_cl_double    SIZEOF_CL_DOUBLE=$ac_cv_sizeof_cl_double
426    fi    fi
427  fi  fi
428    else
429      CL_ENABLED=false
430      CL_VERSION="0"
431      SIZEOF_CL_INT="0"
432      SIZEOF_CL_LONG="0"
433      SIZEOF_CL_FLOAT="0"
434      SIZEOF_CL_DOUBLE="0"
435    fi
436    
437  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
438  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
439  AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])  AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
# Line 220  Line 443 
443  AC_SUBST(SIZEOF_CL_FLOAT)  AC_SUBST(SIZEOF_CL_FLOAT)
444  AC_SUBST(SIZEOF_CL_DOUBLE)  AC_SUBST(SIZEOF_CL_DOUBLE)
445    
446  dnl  #################### end OpenCL configuration ####################
 dnl check for various library routines etc.  
 dnl  
 AC_CHECK_FUNCS(posix_memalign)  
 if test x"$ac_cv_func_posix_memalign" != xyes ; then  
   AC_CHECK_FUNCS(memalign)  
   if test x"$ac_cv_func_posix_memalign" != xyes ; then  
     AC_CHECK_FUNCS(valloc)  
   fi  
 fi  
   
 AC_CHECK_FUNCS(mach_absolute_time)  
 AC_CHECK_TYPES([struct timespec])  
 AC_CHECK_FUNCS(pthread_barrier_init)  
   
 dnl  
 dnl check for clock_gettime.  On Linux, this requires librt.  
 dnl  
 save_LIBS=$LIBS  
 LIBS="-lrt $LIBS"  
 AC_MSG_CHECKING([for clock_gettime])  
 AC_LINK_IFELSE(  
   [AC_LANG_PROGRAM(  
     [[#include <time.h>]],  
     [[struct timespec t; clock_gettime(CLOCK_REALTIME, &t); ]])],  
   [ ac_cv_func_clock_gettime=yes;  
     AC_DEFINE(HAVE_CLOCK_GETTIME, [1], [is clock_gettime available?])],  
   [ac_cv_func_clock_gettime=no])  
 AC_MSG_RESULT($ac_cv_func_clock_gettime)  
 if test "$ac_cv_func_clock_gettime" = "no" ; then  
   LIBS=$save_LIBS  
 fi  
   
 AC_CHECK_FUNCS(pthread_getcpuclockid)  
 AC_CHECK_FUNCS(sigtimedwait nanosleep)  
   
 dnl  
 dnl check for sched_setaffinity  
 dnl  
 AC_CHECK_FUNCS(sched_setaffinity)  
   
 dnl  
 dnl check for pthread_setaffinity_np  
 dnl  
 save_LIBS=$LIBS  
 save_CFLAGS=$CFLAGS  
 LIBS="$PTHREAD_LIBS $LIBS"  
 CFLAGS="$PTHREAD_CFLAGS $CFLAGS"  
 AC_MSG_CHECKING([for pthread_setaffinity_np])  
 AC_LINK_IFELSE(  
   [AC_LANG_PROGRAM(  
     [[#include <pthread.h>]],  
     [[cpu_set_t s; pthread_setaffinity_np(pthread_self(), sizeof(s), &s); ]])],  
   [ ac_cv_func_pthread_setaffinity_np=yes;  
     AC_DEFINE(HAVE_PTHREAD_SETAFFINITY_NP, [1], [is pthread_setaffinity_np available?])],  
   [ac_cv_func_pthread_setaffinity_np=no])  
 AC_MSG_RESULT($ac_cv_func_pthread_setaffinity_np)  
 LIBS=$save_LIBS  
 CFLAGS=$save_CFLAGS  
   
 dnl  
 dnl check for Linux NUMA support (libnuma)  
 dnl  
 AC_CHECK_LIB(numa,numa_available)  
 if test "$ac_cv_lib_numa_numa_available" = "yes" ; then  
   PTHREAD_LIBS="$PTHREAD_LIBS -lnuma"  
 fi  
   
 dnl check for /proc/cpuinfo  
 dnl  
 AC_CHECK_FILES(/proc/cpuinfo)  
   
 dnl  
 dnl OS-specific linking issues  
 dnl  
 LD_NEEDS_RPATH=false;  
 LIBM=""  
 case "$host_os" in  
   darwin*) # On Mac OS X we check for the presence of macports and/or fink  
     if test -x /opt/local/bin/port ; then  
       HAS_MACPORTS=yes  
     else  
       HAS_MACPORTS=no  
     fi  
     if test -x /sw/bin/fink ; then  
       HAS_FINK=yes  
     else  
       HAS_FINK=no  
     fi  
   ;;  
   linux*) # On Linux we include the -rpath option to pick up dynamically-loaded libraries  
     LD_NEEDS_RPATH=true  
     LIBM="-lm"  
   ;;  
 esac  
447    
448  if test x"$HAS_MACPORTS" = xyes ; then  #################### Teem configuration ####################
   LDPATHS="-L/opt/local/lib"  
 elif test x"$HAS_FINK" = xyes ; then  
   LDPATHS="-L/sw/lib"  
 else  
   LDPATHS=""  
 fi  
 AC_SUBST(LDPATHS)  
 AC_SUBST(LD_NEEDS_RPATH)  
 AC_SUBST(LIBM)  
449    
 dnl  
450  dnl get the path to the TEEM installation.  We need this to build the Diderot  dnl get the path to the TEEM installation.  We need this to build the Diderot
451  dnl runtime code and we use the path when searching for teem in the Diderot  dnl runtime code and we use the path when searching for teem in the Diderot
452  dnl compiler.  dnl compiler.
453  dnl  dnl
454    
455    dnl the path can be specified using "--with-teem=..." too
456    dnl
457  AC_ARG_WITH(teem,  AC_ARG_WITH(teem,
458    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),
459    [ac_cv_use_teem=$withval], [ac_cv_use_teem=no])    [ac_cv_use_teem=$withval], [ac_cv_use_teem=no])
460    
461  if test x"$ac_cv_use_teem" = xno ; then  if test x"$ac_cv_use_teem" = xno ; then
462    dnl search for Teem in some standard places
463    dnl
464      AC_MSG_CHECKING([for teem])
465    TEEM_DIR=none    TEEM_DIR=none
466      POSSIBLE_TEEM_DIRS="/usr/local/teem /usr/local"
467      for dir in $POSSIBLE_TEEM_DIRS ; do
468        if test -f $dir/include/teem/nrrd.h ; then
469          TEEM_DIR=$dir
470          AC_MSG_RESULT([$TEEM_DIR])
471          break
472        fi
473      done
474      if test $TEEM_DIR = none ; then
475        AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])
476      fi
477  else  else
478    AC_MSG_CHECKING([path to teem ($ac_cv_use_teem)])    AC_MSG_CHECKING([path to teem ($ac_cv_use_teem)])
479    case $ac_cv_use_teem in    case $ac_cv_use_teem in
# Line 350  Line 487 
487        AC_MSG_RESULT([yes])        AC_MSG_RESULT([yes])
488      else      else
489        TEEM_DIR=none        TEEM_DIR=none
490        AC_MSG_RESULT([no])        AC_MSG_RESULT([invalid path to teem])
491      fi      fi
492    else    else
493      TEEM_DIR=none      TEEM_DIR=none
494      AC_MSG_RESULT([no])      AC_MSG_RESULT([invalid path to teem])
495    fi    fi
496  fi  fi
497  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
498    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])    AC_MSG_ERROR([unable to find teem])
499  fi  fi
500  dnl  dnl
501  dnl check that unu supports the dnorm command  dnl check that teem supports the nrrdMetaDataNormalize function
502  dnl  dnl
503  if test x"$TEEM_DIR" != xnone ; then  save_LDFLAGS=$LDFLAGS
504    AC_MSG_CHECKING([that \"unu dnorm\" works])  save_LIBS=$LIBS
505    if test -x $TEEM_DIR/bin/unu ; then  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
506      $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null  LIBS="$LIBS -lteem -lm"
507      if test $? -eq 0 ; then  AC_CHECK_FUNCS([nrrdMetaDataNormalize])
508        AC_MSG_RESULT([yes])  LDFLAGS=$save_LDFLAGS
509      else  LIBS=$save_LIBS
510        AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])  
511      fi  if test "x$ac_cv_func_nrrdMetaDataNormalize" != xyes; then
512    else    AC_MSG_ERROR(["please update your teem installation"])
     AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])  
   fi  
513  fi  fi
514    
515  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
516    
517  dnl ******************** SML/NJ configuration ********************  #################### end Teem configuration ####################
518    
519    #################### SML configuration ####################
520    
521  dnl  dnl
522  dnl We support building with both SML/NJ (the default) or MLton.  dnl We support building with both SML/NJ (the default) or MLton.
523  dnl  dnl
# Line 408  Line 547 
547    fi    fi
548  fi  fi
549    
550  if test $with_mlton = xno ; then  if test x"$with_mlton" = xno ; then
551    # we are using SML/NJ    # we are using SML/NJ
552    #    #
553    
554    dnl check that we have a compatible version of SML/NJ    dnl check that we have a compatible version of SML/NJ
555    dnl    dnl
556    CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; check your PATH or set SMLNJ_CMD])])    CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; please add it to your PATH or set SML_CMD])])
557    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
558      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
559    then    then
560      AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])      AC_MSG_ERROR([installation requires SML/NJ version 110.80+ (available from smlnj.org)])
561    fi    fi
562    
563    dnl determine the heap-image suffix    dnl determine the heap-image suffix
# Line 428  Line 567 
567    
568    dnl look for ml-makedepend    dnl look for ml-makedepend
569    dnl    dnl
   AC_MSG_CHECKING([for ml-makedepend])  
570    tmpPATH="$SMLNJ_PATH:$PATH"    tmpPATH="$SMLNJ_PATH:$PATH"
571    AC_PATH_PROG(ML_MAKEDEPEND, ml-makedepend, ":", $tmpPATH)    AC_PATH_PROG(ML_MAKEDEPEND, ml-makedepend, ":", $tmpPATH)
   if test $ML_MAKEDEPEND = none ; then  
     AC_MSG_ERROR([ml-makedepend not found])  
   else  
     AC_MSG_RESULT([$ML_MAKEDEPEND])  
   fi  
572    AC_SUBST(ML_MAKEDEPEND)    AC_SUBST(ML_MAKEDEPEND)
573    
574    dnl    dnl
# Line 449  Line 582 
582    AC_SUBST(ML_BUILD)    AC_SUBST(ML_BUILD)
583    SML=smlnj    SML=smlnj
584    
585      HEAP_IMAGE_DIR=$DIDEROT_BINDIR/.heap
586      INSTALL_SMLNJ_WRAPPER=$DIDEROT_BINDIR/install-sml-wrapper.sh
587      AC_SUBST(HEAP_IMAGE_DIR)
588      AC_SUBST(INSTALL_SMLNJ_WRAPPER)
589    
590  else  else
591    
592    # we are using MLton    # we are using MLton
593    MLTON=$with_mlton    MLTON=$with_mlton
594    AC_SUBST(MLTON)    AC_SUBST(MLTON)
595    SML=mlton    SML=mlton
596    
597  fi  fi
598  AC_SUBST(SML)  AC_SUBST(SML)
599    
600  dnl ******************** Documentation tools ********************  #################### end SML configuration ####################
601    
602    #################### Documentation tools configuration ####################
603    
604  dnl check for doxygen  dnl check for doxygen
605  dnl  dnl
# Line 508  Line 650 
650  AC_SUBST(HIGHLIGHTER)  AC_SUBST(HIGHLIGHTER)
651  AC_SUBST(DBLATEX)  AC_SUBST(DBLATEX)
652    
653    #################### end Documentation tools configuration ####################
654    
655  dnl ******************** Paths ********************  #################### config.h ####################
   
 DIDEROT_ROOT=`pwd`  
 DIDEROT_DOCDIR=$DIDEROT_ROOT/doc  
 DIDEROT_SRCDIR=$DIDEROT_ROOT/src  
 DIDEROT_LIBDIR=$DIDEROT_ROOT/lib  
 DIDEROT_BINDIR=$DIDEROT_ROOT/bin  
 DIDEROT_MKDIR=$DIDEROT_ROOT/mk  
   
 HEAP_IMAGE_DIR=$DIDEROT_BINDIR/.heap  
 INSTALL_SMLNJ_WRAPPER=$DIDEROT_BINDIR/install-sml-wrapper.sh  
   
 AC_SUBST(DIDEROT_ROOT)  
 AC_SUBST(DIDEROT_DOCDIR)  
 AC_SUBST(DIDEROT_SRCDIR)  
 AC_SUBST(DIDEROT_LIBDIR)  
 AC_SUBST(DIDEROT_BINDIR)  
 AC_SUBST(DIDEROT_MKDIR)  
 AC_SUBST(HEAP_IMAGE_DIR)  
 AC_SUBST(INSTALL_SMLNJ_WRAPPER)  
   
 dnl  
 dnl ******************** C compiler properties ********************  
 dnl  
656    
657  dnl  AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/lib/include"], [path for Diderot header files])
 dnl run the compiler tests in 64-bit mode  
 dnl  
 save_CFLAGS=$CFLAGS  
 CFLAGS="$CFLAGS $CFLAG_MXX"  
   
 dnl  
 dnl check for gcc builtin atomic operations  
 dnl  
 AC_MSG_CHECKING([for builtin atomic operations])  
 AC_LINK_IFELSE(  
    [AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);])],  
    AC_MSG_RESULT(yes)  
    AC_DEFINE(  
     [HAVE_BUILTIN_ATOMIC_OPS], 1,  
     [Define to 1 if gcc compiler provides atomic operations.]),  
    AC_MSG_RESULT(no))  
   
 AC_C_BIGENDIAN  
   
 #  
 # determine the sizes of the standard C types  
 AC_CHECK_SIZEOF([int])  
 SIZEOF_C_INT=$ac_cv_sizeof_int  
 AC_CHECK_SIZEOF([long])  
 SIZEOF_C_LONG=$ac_cv_sizeof_long  
 AC_CHECK_SIZEOF([float])  
 SIZEOF_C_FLOAT=$ac_cv_sizeof_float  
 AC_CHECK_SIZEOF([double])  
 SIZEOF_C_DOUBLE=$ac_cv_sizeof_double  
   
 AC_SUBST(SIZEOF_C_INT)  
 AC_SUBST(SIZEOF_C_LONG)  
 AC_SUBST(SIZEOF_C_FLOAT)  
 AC_SUBST(SIZEOF_C_DOUBLE)  
   
 dnl  
 dnl restore CFLAGS  
 dnl  
 CFLAGS=$save_CFLAGS  
   
 dnl  
 dnl ******************** config.h stuff ********************  
 dnl  
   
 AC_DEFINE_UNQUOTED(DIDEROT_INCLUDE_PATH,["$DIDEROT_SRCDIR/include"], [path for Diderot header files])  
658    
659  AH_TOP([  AH_TOP([
660  /*  /*
661   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
662   *   *
663   * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.   * COPYRIGHT (c) 2016 The University of Chicago * All rights reserved.
664   */   */
665    
666  #ifndef _DIDEROT_CONFIG_H_  #ifndef _DIDEROT_CONFIG_H_
# Line 594  Line 669 
669  ])  ])
670  AH_BOTTOM([  AH_BOTTOM([
671    
 #ifdef NDEBUG  
 #define STATIC_INLINE   static inline  
 #else  
 #define STATIC_INLINE   static  
 #endif  
   
672  #endif /* !_DIDEROT_CONFIG_H_ */  #endif /* !_DIDEROT_CONFIG_H_ */
673  ])  ])
674    
675  dnl  #################### end config.h ####################
676  dnl ******************** write output ********************  
677  dnl  #################### write output ####################
678    
679  dnl The compiler Makefile depends on which SML system we are  dnl The compiler Makefile depends on which SML system we are
680  dnl using.  dnl using.
 AC_MSG_NOTICE([using $SML])  
681  if test x"$SML" = xmlton ; then  if test x"$SML" = xmlton ; then
682    COMPILER_MAKEFILE_IN=":src/compiler/Makefile_mlton.in"    COMPILER_MAKEFILE_IN=":src/compiler/Makefile_mlton.in"
683  else  else
# Line 624  Line 692 
692  dnl  doc/man/Makefile  dnl  doc/man/Makefile
693  dnl  src/clinfo/Makefile  dnl  src/clinfo/Makefile
694    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
695  dnl  src/lib/build/Makefile    src/lib/build/Makefile
696  dnl  src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
 dnl  test/MIP/Makefile  
 dnl  test/probe/Makefile  
 dnl  test/iso2d-polyline/Makefile  
 dnl  test/vr-lite-cam/Makefile  
 dnl  test/hlic/Makefile  
697  dnl  dnl
698  dnl ***** SML source files *****  dnl ***** SML source files *****
699    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in
# Line 639  Line 702 
702    src/compiler/options/version.sml:src/compiler/options/version_sml.in    src/compiler/options/version.sml:src/compiler/options/version_sml.in
703  )  )
704    
705  AC_CONFIG_HEADERS(src/include/Diderot/config.h:config/config_h.in)  AC_CONFIG_HEADERS(src/lib/include/diderot/config.h:config/config_h.in)
706    
707  dnl  dnl
708  dnl shell scripts  dnl shell scripts
# Line 647  Line 710 
710  AC_CONFIG_FILES([  AC_CONFIG_FILES([
711    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
712  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
713  # AC_CONFIG_FILES([  AC_CONFIG_FILES([
714  #   src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in    src/compiler/gen/fragments/mkfrags.sh:src/compiler/gen/fragments/mkfrags_sh.in
715  # ], [chmod +x src/compiler/gen/file2str/file2str.sh])  ], [chmod +x src/compiler/gen/fragments/mkfrags.sh])
716  # AC_CONFIG_FILES([  AC_CONFIG_FILES([
717  #   rtest/scripts/run.sh:rtest/scripts/run_sh.in    src/compiler/gen/fragments/mkmk.sh:src/compiler/gen/fragments/mkmk_sh.in
718  # ], [chmod +x rtest/scripts/run.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
719  # AC_CONFIG_FILES([  
720  #   rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in  dnl
721  # ], [chmod +x rtest/scripts/run-one.sh])  dnl additional files for logging tools
722  #  dnl
723  # more regression tests; should merge with rtest at some point  if test x"$LOGGING_ENABLED" = xtrue ; then
724  #    AC_CONFIG_FILES(
725  # AC_CONFIG_FILES([      src/logging/gen/Makefile
726  #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in      src/logging/log-dump/Makefile
727  # ], [chmod +x rtest2/scripts/run.sh])      src/logging/gen/main.sml:src/logging/gen/main_sml.in
728  # AC_CONFIG_FILES([      src/logging/lib/default-log-paths.hxx:src/logging/lib/default-log-paths_hxx.in
729  #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in    )
730  # ], [chmod +x rtest2/scripts/run-one.sh])  fi
731    
732  dnl  dnl
733  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
734  dnl  dnl
735  dnl usage: MK_BUILD_DIR(<build-dir>, <target-platform>, <options>)  dnl usage: MK_BUILD_DIR(<build-dir>, <target-platform>, <options>)
736  dnl  dnl
737    dnl where the options are taken from [debug, parallel]
738    dnl
739  AC_DEFUN([MK_BUILD_DIR], [  AC_DEFUN([MK_BUILD_DIR], [
740      if test ! -d src/lib/build/$1 ; then      if test ! -d src/lib/build/$1 ; then
741        mkdir src/lib/build/$1        mkdir src/lib/build/$1
# Line 683  Line 748 
748      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
749    ])    ])
750    
751  #MK_BUILD_DIR(rt-c-f, c, [float])  MK_BUILD_DIR(rt-seq, sequential, [])
752  #MK_BUILD_DIR(rt-c-d, c, [double])  MK_BUILD_DIR(rt-seq-debug, sequential, [debug])
753  #MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  MK_BUILD_DIR(rt-par, parallel, [parallel])
754  #MK_BUILD_DIR(rt-c-d-debug, c, [double debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
755  #MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  
756  #MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])  if test x"$LOGGING_ENABLED" = xtrue ; then
757  #MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])    MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
758  #MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])  fi
759    
760  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
761  #  MK_BUILD_DIR(rt-cl-f, cl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
762  #  MK_BUILD_DIR(rt-cl-d, cl, [double])  #  MK_BUILD_DIR(rt-cl-d, opencl, [double])
763  #  MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])  #  MK_BUILD_DIR(rt-cl-f-debug, opencl, [float debug])
764  #  MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])  #  MK_BUILD_DIR(rt-cl-d-debug, opencl, [double debug])
765  #fi  #fi
766    
767  AC_OUTPUT  AC_OUTPUT
768    
769    #################### end write output ####################

Legend:
Removed from v.3715  
changed lines
  Added in v.4849

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