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 4306, Fri Jul 29 19:22:49 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 77  Line 77 
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 430  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 467  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 479  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 535  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

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

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