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 4127, Thu Jun 30 22:58:39 2016 UTC revision 4419, Wed Aug 17 12:49:55 2016 UTC
# 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
# Line 71  Line 71 
71    
72  dnl extra compiler options  dnl extra compiler options
73  dnl  dnl
74  CXXFLAGS_BASE="$CXXFLAGS -Wreturn-type -Wuninitialized"  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"
75    
76  AC_ARG_ENABLE([32-bit],  AC_ARG_ENABLE([32-bit],
77    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]),
78    [CXXFLAG_Mxx="-m32"],    [CXXFLAG_Mxx="-m32"],
79    [CXXFLAG_Mxx="-m64"])    [CXXFLAG_Mxx="-m64"])
80  if test x"$CXX" != "xclang++" ; then  
81    dnl check to see if we need the explicitly instantiate templates (as required by gcc).
82    dnl
83    case x"$CXX" in
84      xclang*)
85        EXPLICIT_TEMPLATES="false"
86        ;;
87      *)
88    CXXFLAGS_BASE="$CXXFLAGS_BASE -fno-implicit-templates"    CXXFLAGS_BASE="$CXXFLAGS_BASE -fno-implicit-templates"
89  fi      EXPLICIT_TEMPLATES="true"
90        ;;
91    esac
92    
93  CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"  CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"
94  AC_SUBST(CXXFLAG_Mxx)  AC_SUBST(CXXFLAG_Mxx)
95  AC_SUBST(CXXFLAGS_BASE)  AC_SUBST(CXXFLAGS_BASE)
96    AC_SUBST(EXPLICIT_TEMPLATES)
97    
98  dnl  dnl
99  dnl run the compiler tests in 64-bit mode  dnl run the compiler tests in 64-bit mode
# Line 132  Line 142 
142  AC_HEADER_STDBOOL  AC_HEADER_STDBOOL
143    
144  dnl  dnl
145    dnl the C boolean type to use in generated library headers
146    dnl
147    if test x"$ac_cv_header_stdbool_h" = xyes ; then
148      BOOLTY="bool"
149    elif test "x$ac_cv_type__Bool" = xyes; then
150      BOOLTY="_Bool"
151    else
152      BOOLTY="int"
153    fi
154    AC_SUBST(BOOLTY)
155    
156    dnl
157  dnl check for pthreads support  dnl check for pthreads support
158  dnl  dnl
159  ACX_PTHREAD  ACX_PTHREAD
# Line 245  Line 267 
267    
268  #################### CUDA configuration ####################  #################### CUDA configuration ####################
269    
270    AC_ARG_ENABLE([cuda],
271      AC_HELP_STRING([--enable-cuda], [include support for targeting CUDA]))
272    
273    if test "${enable_cuda+set}" = set ; then
274  dnl  dnl
275  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
276  dnl  dnl
# Line 258  Line 284 
284    AC_MSG_RESULT([$NVCC])    AC_MSG_RESULT([$NVCC])
285    CUDA_ENABLED=true    CUDA_ENABLED=true
286  fi  fi
287    else
288      NVCC=":"
289      CUDA_ENABLED=false
290    fi
291  AC_SUBST(NVCC)  AC_SUBST(NVCC)
292  AC_SUBST(CUDA_ENABLED)  AC_SUBST(CUDA_ENABLED)
293    
# Line 265  Line 295 
295    
296  #################### OpenCL configuration ####################  #################### OpenCL configuration ####################
297    
298    AC_ARG_ENABLE([opencl],
299      AC_HELP_STRING([--enable-opencl], [include support for targeting OpenCL]))
300    
301    if test "${enable_opencl+set}" = set ; then
302    
303  dnl  dnl
304  dnl check for OpenCL support  dnl check for OpenCL support
305  dnl  dnl
# Line 383  Line 418 
418    SIZEOF_CL_DOUBLE=$ac_cv_sizeof_cl_double    SIZEOF_CL_DOUBLE=$ac_cv_sizeof_cl_double
419    fi    fi
420  fi  fi
421    else
422      CL_ENABLED=false
423      CL_VERSION="0"
424      SIZEOF_CL_INT="0"
425      SIZEOF_CL_LONG="0"
426      SIZEOF_CL_FLOAT="0"
427      SIZEOF_CL_DOUBLE="0"
428    fi
429    
430  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
431  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
432  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 396  Line 440 
440    
441  #################### Teem configuration ####################  #################### Teem configuration ####################
442    
 dnl  
443  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
444  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
445  dnl compiler.  dnl compiler.
446  dnl  dnl
447    
448    dnl the path can be specified using "--with-teem=..." too
449    dnl
450  AC_ARG_WITH(teem,  AC_ARG_WITH(teem,
451    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),
452    [ac_cv_use_teem=$withval], [ac_cv_use_teem=no])    [ac_cv_use_teem=$withval], [ac_cv_use_teem=no])
453    
454  if test x"$ac_cv_use_teem" = xno ; then  if test x"$ac_cv_use_teem" = xno ; then
455    dnl search for Teem in some standard places
456    dnl
457      AC_MSG_CHECKING([for teem])
458    TEEM_DIR=none    TEEM_DIR=none
459      POSSIBLE_TEEM_DIRS="/usr/local/teem /usr/local"
460      for dir in $POSSIBLE_TEEM_DIRS ; do
461        if test -f $dir/include/teem/nrrd.h ; then
462          TEEM_DIR=$dir
463          AC_MSG_RESULT([$TEEM_DIR])
464          break
465        fi
466      done
467      if test $TEEM_DIR = none ; then
468    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])
469      fi
470  else  else
471    AC_MSG_CHECKING([path to teem ($ac_cv_use_teem)])    AC_MSG_CHECKING([path to teem ($ac_cv_use_teem)])
472    case $ac_cv_use_teem in    case $ac_cv_use_teem in
# Line 433  Line 493 
493  dnl  dnl
494  dnl check that unu supports the dnorm command  dnl check that unu supports the dnorm command
495  dnl  dnl
 if test x"$TEEM_DIR" != xnone ; then  
496    AC_MSG_CHECKING([that \"unu dnorm\" works])    AC_MSG_CHECKING([that \"unu dnorm\" works])
497    if test -x $TEEM_DIR/bin/unu ; then    if test -x $TEEM_DIR/bin/unu ; then
498      $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null      $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null
# Line 445  Line 504 
504    else    else
505      AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])      AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])
506    fi    fi
507  fi  
508  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
509    
510  #################### end Teem configuration ####################  #################### end Teem configuration ####################
# Line 501  Line 560 
560    
561    dnl look for ml-makedepend    dnl look for ml-makedepend
562    dnl    dnl
   AC_MSG_CHECKING([for ml-makedepend])  
563    tmpPATH="$SMLNJ_PATH:$PATH"    tmpPATH="$SMLNJ_PATH:$PATH"
564    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  
565    AC_SUBST(ML_MAKEDEPEND)    AC_SUBST(ML_MAKEDEPEND)
566    
567    dnl    dnl
# Line 537  Line 590 
590  fi  fi
591  AC_SUBST(SML)  AC_SUBST(SML)
592    
593  #################### SML configuration ####################  #################### end SML configuration ####################
594    
595  #################### Documentation tools configuration ####################  #################### Documentation tools configuration ####################
596    

Legend:
Removed from v.4127  
changed lines
  Added in v.4419

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