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 4422, Wed Aug 17 16:03:13 2016 UTC revision 4665, Thu Sep 29 17:57:02 2016 UTC
# Line 6  Line 6 
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) 2016 The University of Chicago]])  AC_COPYRIGHT([[COPYRIGHT (c) 2016 The University of Chicago]])
# Line 23  Line 23 
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)
# Line 73  Line 77 
77  dnl  dnl
78  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"
79    
80    dnl check for SIMD support
81    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    [CXXFLAG_Mxx="-m32"],    [CXXFLAG_Mxx="-m32"],
# Line 478  Line 486 
486    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
487  fi  fi
488  dnl  dnl
489  dnl check that unu supports the dnorm command  dnl check that teem supports the nrrdMetaDataNormalize function
490  dnl  dnl
491  AC_MSG_CHECKING([that \"unu dnorm\" works])  save_LDFLAGS=$LDFLAGS
492  if test -x $TEEM_DIR/bin/unu ; then  save_LIBS=$LIBS
493    $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
494    if test $? -eq 0 ; then  LIBS="$LIBS -lteem -lm"
495      AC_MSG_RESULT([yes])  AC_CHECK_FUNCS([nrrdMetaDataNormalize])
496    else  LDFLAGS=$save_LDFLAGS
497      AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])  LIBS=$save_LIBS
498    fi  
499  else  if test "x$ac_cv_func_nrrdMetaDataNormalize" != xyes; then
500    AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])    AC_MSG_ERROR(["please update your teem installation"])
501  fi  fi
502    
503  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
# Line 535  Line 543 
543    dnl    dnl
544    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])])
545    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
546      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
547    then    then
548      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)])
549    fi    fi
550    
551    dnl determine the heap-image suffix    dnl determine the heap-image suffix
# Line 674  Line 682 
682    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
683    src/lib/build/Makefile    src/lib/build/Makefile
684    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  
685  dnl  dnl
686  dnl ***** SML source files *****  dnl ***** SML source files *****
687    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 707  Line 710 
710  AC_CONFIG_FILES([  AC_CONFIG_FILES([
711    src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in    src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in
712  ], [chmod +x src/tests/rtest/scripts/run-one.sh])  ], [chmod +x src/tests/rtest/scripts/run-one.sh])
 #  
 # more regression tests; should merge with rtest at some point  
 #  
 # AC_CONFIG_FILES([  
 #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in  
 # ], [chmod +x rtest2/scripts/run.sh])  
 # AC_CONFIG_FILES([  
 #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in  
 # ], [chmod +x rtest2/scripts/run-one.sh])  
713    
714  dnl  dnl
715  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds

Legend:
Removed from v.4422  
changed lines
  Added in v.4665

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