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 3348, Tue Oct 27 15:13:58 2015 UTC revision 3715, Sat Apr 2 17:23:54 2016 UTC
# Line 6  Line 6 
6  dnl All rights reserved.  dnl All rights reserved.
7  dnl  dnl
8    
9  AC_INIT(diderot,0.1,)  AC_INIT(diderot,1.0,)
10    
11  AC_PREREQ(2.60)  AC_PREREQ(2.60)
12  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])
13  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)  AC_CONFIG_SRCDIR(src/compiler/options/ctl.sml)
14  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
15  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
16    
17  dnl  dnl
18    dnl set the following to the name of the branch
19    dnl
20    BRANCH="master"
21    AC_SUBST(BRANCH)
22    
23    dnl
24  dnl include additional macros  dnl include additional macros
25  dnl  dnl
26  sinclude(config/acx_pthread.m4)  sinclude(config/acx_pthread.m4)
# Line 129  Line 135 
135          break          break
136        fi        fi
137      done      done
138      if test x"$CUDA" != xnone ; then      if test x"$CUDA_HOME" != xnone ; then
139        HAVE_CL_H="yes"        HAVE_CL_H="yes"
140        CL_HEADER="$CUDA_HOME/include/CL/cl.h"        CL_HEADER="$CUDA_HOME/include/CL/cl.h"
141        AC_DEFINE([HAVE_CL_CL_H])        AC_DEFINE([HAVE_CL_CL_H])
# Line 374  Line 380 
380    
381  dnl ******************** SML/NJ configuration ********************  dnl ******************** SML/NJ configuration ********************
382  dnl  dnl
383    dnl We support building with both SML/NJ (the default) or MLton.
384    dnl
385    
386    dnl first check for --with-mlton=path flag
387    dnl
388    AC_ARG_WITH([mlton],
389      [AS_HELP_STRING([--with-mlton=<path-to-mlton>],
390        [use the MLton Standard ML compiler to build Diderot])],
391      [with_mlton=yes],[with_mlton=no])
392    if test x"$with_mlton" = xyes ; then
393      if test x"$ac_cv_path_with_mlton" = x ; then
394        # look for mlton in the PATH
395        AC_PATH_PROGS(with_mlton, mlton, no)
396        if test x"$MLTON" = xno ; then
397          AC_MSG_ERROR([unable to find mlton executable; please specify the path])
398        fi
399      else
400        with_mlton=$ac_cv_path_with_mlton
401        case $with_mlton in
402          /*) ;;
403          *) AC_MSG_ERROR([please specify absolute path for mlton executable]) ;;
404        esac
405        if test ! -x $with_mlton ; then
406          AC_MSG_ERROR([invalid path for mlton; $with_mlton is not executable])
407        fi
408      fi
409    fi
410    
411    if test $with_mlton = xno ; then
412      # we are using SML/NJ
413      #
414    
415  dnl check that we have a compatible version of SML/NJ  dnl check that we have a compatible version of SML/NJ
416  dnl  dnl
# Line 383  Line 420 
420  then  then
421    AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])    AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])
422  fi  fi
 AC_SUBST(SMLNJ_VERSION)  
423    
424  dnl determine the heap-image suffix  dnl determine the heap-image suffix
425  dnl  dnl
# Line 411  Line 447 
447    AC_MSG_ERROR([ml-build not found])    AC_MSG_ERROR([ml-build not found])
448  fi  fi
449  AC_SUBST(ML_BUILD)  AC_SUBST(ML_BUILD)
450      SML=smlnj
451    
452    else
453      # we are using MLton
454      MLTON=$with_mlton
455      AC_SUBST(MLTON)
456      SML=mlton
457    fi
458    AC_SUBST(SML)
459    
460  dnl ******************** Documentation tools ********************  dnl ******************** Documentation tools ********************
461    
462  dnl check for doxygen  dnl check for doxygen
463  dnl  dnl
464  AC_ARG_WITH([doxygen],  AC_ARG_WITH([doxygen],
465    [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],    [AS_HELP_STRING([--with-doxygen=<path>], [specify location of doxygen executable])],
466    [DOXYGEN=$with_doxygen],    [DOXYGEN=$with_doxygen],
467    [DOXYGEN=none])    [DOXYGEN=none])
468  if test x$DOXYGEN = xnone ; then  if test x$DOXYGEN = xnone ; then
# Line 562  Line 607 
607  dnl ******************** write output ********************  dnl ******************** write output ********************
608  dnl  dnl
609    
610    dnl The compiler Makefile depends on which SML system we are
611    dnl using.
612    AC_MSG_NOTICE([using $SML])
613    if test x"$SML" = xmlton ; then
614      COMPILER_MAKEFILE_IN=":src/compiler/Makefile_mlton.in"
615    else
616      COMPILER_MAKEFILE_IN=""
617    fi
618    
619  AC_CONFIG_FILES(  AC_CONFIG_FILES(
620  dnl  dnl
621  dnl ***** Makefiles *****  dnl ***** Makefiles *****
# Line 569  Line 623 
623  dnl  doc/Makefile  dnl  doc/Makefile
624  dnl  doc/man/Makefile  dnl  doc/man/Makefile
625  dnl  src/clinfo/Makefile  dnl  src/clinfo/Makefile
626  dnl  src/compiler/Makefile    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
627  dnl  src/lib/build/Makefile  dnl  src/lib/build/Makefile
628  dnl  src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in  dnl  src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
629  dnl  test/MIP/Makefile  dnl  test/MIP/Makefile
# Line 579  Line 633 
633  dnl  test/hlic/Makefile  dnl  test/hlic/Makefile
634  dnl  dnl
635  dnl ***** SML source files *****  dnl ***** SML source files *****
636  dnl  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
637    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
638    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
639      src/compiler/options/version.sml:src/compiler/options/version_sml.in
640  )  )
641    
642  AC_CONFIG_HEADERS(src/include/Diderot/config.h:config/config_h.in)  AC_CONFIG_HEADERS(src/include/Diderot/config.h:config/config_h.in)

Legend:
Removed from v.3348  
changed lines
  Added in v.3715

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