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 4841, Mon Dec 19 23:00:09 2016 UTC
# Line 54  Line 54 
54  AC_SUBST(DIDEROT_BINDIR)  AC_SUBST(DIDEROT_BINDIR)
55  AC_SUBST(DIDEROT_MKDIR)  AC_SUBST(DIDEROT_MKDIR)
56    
57    dnl
58    dnl the log-file description
59    dnl
60    DEFAULT_LOG_EVENTS_PATH=$DIDEROT_SRCDIR/logging/log-events.json
61    AC_SUBST(DEFAULT_LOG_EVENTS_PATH)
62    
63  #################### end Paths configuration ####################  #################### end Paths configuration ####################
64    
65  dnl check for standard programs  dnl check for standard programs
# Line 260  Line 266 
266  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
267  AC_SUBST(LIBM)  AC_SUBST(LIBM)
268    
269    #################### Logging configuration ####################
270    
271    LOGGING_ENABLED=false
272    AC_ARG_ENABLE([enable-event-logging],
273      AC_HELP_STRING([--enable-event-logging], [include event-logging support for parallel target]),
274      [LOGGING_ENABLED=true],
275      [LOGGING_ENABLED=false])
276    
277    AC_SUBST(LOGGING_ENABLED)
278    
279    #################### end Logging configuration ####################
280    
281  #################### CUDA configuration ####################  #################### CUDA configuration ####################
282    
283  AC_ARG_ENABLE([cuda],  AC_ARG_ENABLE([cuda],
# Line 541  Line 559 
559    
560    dnl check that we have a compatible version of SML/NJ    dnl check that we have a compatible version of SML/NJ
561    dnl    dnl
562    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])])
563    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
564      -o $SMLNJ_MINOR_VERSION -lt 80      -o $SMLNJ_MINOR_VERSION -lt 80
565    then    then
# Line 682  Line 700 
700    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
701    src/lib/build/Makefile    src/lib/build/Makefile
702    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
703      src/logging/gen/Makefile
704  dnl  dnl
705  dnl ***** SML source files *****  dnl ***** SML source files *****
706    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
707    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
708    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in
709    src/compiler/options/version.sml:src/compiler/options/version_sml.in    src/compiler/options/version.sml:src/compiler/options/version_sml.in
710      src/logging/gen/main.sml:src/logging/gen/main_sml.in
711  )  )
712    
713  AC_CONFIG_HEADERS(src/lib/include/diderot/config.h:config/config_h.in)  AC_CONFIG_HEADERS(src/lib/include/diderot/config.h:config/config_h.in)
# Line 704  Line 724 
724  AC_CONFIG_FILES([  AC_CONFIG_FILES([
725    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
726  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
 AC_CONFIG_FILES([  
   src/tests/rtest/scripts/run.sh:src/tests/rtest/scripts/run_sh.in  
 ], [chmod +x src/tests/rtest/scripts/run.sh])  
 AC_CONFIG_FILES([  
   src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in  
 ], [chmod +x src/tests/rtest/scripts/run-one.sh])  
727    
728  dnl  dnl
729  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 735  Line 749 
749  MK_BUILD_DIR(rt-par, parallel, [parallel])  MK_BUILD_DIR(rt-par, parallel, [parallel])
750  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
751    
752    if test x"$LOGGING_ENABLED" = xtrue ; then
753    MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
754    fi
755    
756  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
757  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
758  #  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.4841

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