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 4665, Thu Sep 29 17:57:02 2016 UTC revision 4859, Thu Dec 29 15:35:15 2016 UTC
# Line 260  Line 260 
260  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
261  AC_SUBST(LIBM)  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 ####################  #################### CUDA configuration ####################
276    
277  AC_ARG_ENABLE([cuda],  AC_ARG_ENABLE([cuda],
# Line 541  Line 553 
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 80      -o $SMLNJ_MINOR_VERSION -lt 80
559    then    then
# Line 704  Line 716 
716  AC_CONFIG_FILES([  AC_CONFIG_FILES([
717    src/compiler/gen/fragments/mkmk.sh:src/compiler/gen/fragments/mkmk_sh.in    src/compiler/gen/fragments/mkmk.sh:src/compiler/gen/fragments/mkmk_sh.in
718  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
719  AC_CONFIG_FILES([  
720    src/tests/rtest/scripts/run.sh:src/tests/rtest/scripts/run_sh.in  dnl
721  ], [chmod +x src/tests/rtest/scripts/run.sh])  dnl additional files for logging tools
722  AC_CONFIG_FILES([  dnl
723    src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in  if test x"$LOGGING_ENABLED" = xtrue ; then
724  ], [chmod +x src/tests/rtest/scripts/run-one.sh])    AC_CONFIG_FILES(
725        src/logging/gen/Makefile
726        src/logging/log-analyze/Makefile
727        src/logging/log-dump/Makefile
728        src/logging/gen/main.sml:src/logging/gen/main_sml.in
729        src/logging/lib/default-log-paths.hxx:src/logging/lib/default-log-paths_hxx.in
730      )
731    fi
732    
733  dnl  dnl
734  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 735  Line 754 
754  MK_BUILD_DIR(rt-par, parallel, [parallel])  MK_BUILD_DIR(rt-par, parallel, [parallel])
755  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
756    
757    if test x"$LOGGING_ENABLED" = xtrue ; then
758      MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
759    fi
760    
761  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
762  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
763  #  MK_BUILD_DIR(rt-cl-d, opencl, [double])  #  MK_BUILD_DIR(rt-cl-d, opencl, [double])

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

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