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 4419, Wed Aug 17 12:49:55 2016 UTC revision 4445, Mon Aug 22 13:59:18 2016 UTC
# Line 78  Line 78 
78    [CXXFLAG_Mxx="-m32"],    [CXXFLAG_Mxx="-m32"],
79    [CXXFLAG_Mxx="-m64"])    [CXXFLAG_Mxx="-m64"])
80    
 dnl check to see if we need the explicitly instantiate templates (as required by gcc).  
 dnl  
 case x"$CXX" in  
   xclang*)  
     EXPLICIT_TEMPLATES="false"  
     ;;  
   *)  
     CXXFLAGS_BASE="$CXXFLAGS_BASE -fno-implicit-templates"  
     EXPLICIT_TEMPLATES="true"  
     ;;  
 esac  
   
81  CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"  CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"
82  AC_SUBST(CXXFLAG_Mxx)  AC_SUBST(CXXFLAG_Mxx)
83  AC_SUBST(CXXFLAGS_BASE)  AC_SUBST(CXXFLAGS_BASE)
 AC_SUBST(EXPLICIT_TEMPLATES)  
84    
85  dnl  dnl
86  dnl run the compiler tests in 64-bit mode  dnl run the compiler tests in 64-bit mode
# Line 491  Line 478 
478    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
479  fi  fi
480  dnl  dnl
481    dnl check that teem supports the nrrdMetaDataNormalize function
482    dnl
483    save_LDFLAGS=$LDFLAGS
484    save_LIBS=$LIBS
485    LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
486    LIBS="$LIBS -lteem"
487    AC_CHECK_FUNCS([nrrdMetaDataNormalize])
488    LDFLAGS=$save_LDFLAGS
489    LIBS=$save_LIBS
490    
491    dnl
492  dnl check that unu supports the dnorm command  dnl check that unu supports the dnorm command
493  dnl  dnl
494  AC_MSG_CHECKING([that \"unu dnorm\" works])  AC_MSG_CHECKING([that \"unu dnorm\" works])
# Line 548  Line 546 
546    dnl    dnl
547    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; check your PATH or set SMLNJ_CMD])])
548    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
549      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
550    then    then
551      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)])
552    fi    fi
553    
554    dnl determine the heap-image suffix    dnl determine the heap-image suffix

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

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