Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/charisee_dev/configure.ac
ViewVC logotype

Diff of /branches/charisee_dev/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2377, Mon Jun 3 19:41:56 2013 UTC revision 2604, Fri Apr 25 18:23:44 2014 UTC
# Line 7  Line 7 
7  AC_INIT(diderot,0.1,)  AC_INIT(diderot,0.1,)
8    
9  AC_PREREQ(2.60)  AC_PREREQ(2.60)
10  AC_COPYRIGHT([[COPYRIGHT (c) 2012 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])  AC_COPYRIGHT([[COPYRIGHT (c) 2013 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])
11  AC_CONFIG_SRCDIR(src/dnorm/dnorm.c)  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)
12  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
13  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
14    
# Line 69  Line 69 
69  dnl  dnl
70  ACX_PTHREAD  ACX_PTHREAD
71    
 dnl check for doxygen  
 dnl  
 AC_ARG_WITH([doxygen],  
   [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],  
   [DOXYGEN=$with_doxygen],  
   [DOXYGEN=none])  
 if test x$DOXYGEN = xnone ; then  
   # see if we can find doxygen in the user's path  
   AC_PATH_PROG(DOXYGEN, [doxygen], [none])  
 fi  
 if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then  
   AC_MSG_ERROR([--with-doxygen option must specify directory argument])  
 elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then  
   AC_MSG_ERROR([doxygen not found at $DOXYGEN])  
 elif test x$DOXYGEN != xnone ; then  
 dnl  
 dnl verify that $DOXYGEN is an absolute path  
 dnl  
   case $DOXYGEN in  
     /*) ;;  
     *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;  
   esac  
 fi  
 if test $DOXYGEN = xnone ; then  
   DOXYGEN=:  
 fi  
 AC_SUBST(DOXYGEN)  
   
72  dnl  dnl
73  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
74  dnl  dnl
# Line 116  Line 88 
88  dnl  dnl
89  dnl check for OpenCL support  dnl check for OpenCL support
90  dnl  dnl
91  LIBS_CL="none"  CL_LIBS="none"
92  case "$host_os" in  case "$host_os" in
93    darwin*) # On Mac OS X we check for installed frameworks    darwin*) # On Mac OS X we check for installed frameworks
94      AX_CHECK_FRAMEWORK([OpenCL], [LIBS_CL="-framework OpenCL"], [])      AX_CHECK_FRAMEWORK([OpenCL], [CL_LIBS="-framework OpenCL"], [])
95    ;;    ;;
96    *)    *)
97      AC_CHECK_LIB([OpenCL],[clGetPlatformIDs],[LIBS_CL="-lOpenCL"])      AC_CHECK_LIB([OpenCL],[clGetPlatformIDs],[CL_LIBS="-lOpenCL"])
98    ;;    ;;
99  esac  esac
100  if test x"$LIBS_CL" = xnone ; then  if test x"$CL_LIBS" = xnone ; then
101    AC_MSG_WARN([no OpenCL library found])    AC_MSG_WARN([no OpenCL library found])
102    CL_ENABLED=false    CL_ENABLED=false
103    CL_VERSION=0    CL_VERSION=0
# Line 207  Line 179 
179    # restore saved CPPFLAGS    # restore saved CPPFLAGS
180      CPPFLAGS=$save_CPPFLAGS      CPPFLAGS=$save_CPPFLAGS
181    # substitutions    # substitutions
182      AC_SUBST(LIBS_CL)      AC_SUBST(CL_LIBS)
183      AC_SUBST(CPPFLAGS_CL)      AC_SUBST(CPPFLAGS_CL)
184    #    #
185    # determine the sizes of the host-side OpenCL types    # determine the sizes of the host-side OpenCL types
# Line 337  Line 309 
309  AC_SUBST(LIBM)  AC_SUBST(LIBM)
310    
311  dnl  dnl
312  dnl get the path to the TEEM installation  dnl get the path to the TEEM installation.  We need this to build the Diderot
313    dnl runtime code and we use the path when searching for teem in the Diderot
314    dnl compiler.
315  dnl  dnl
316  AC_ARG_WITH(teem,  AC_ARG_WITH(teem,
317    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),
# Line 409  Line 383 
383  fi  fi
384  AC_SUBST(ML_BUILD)  AC_SUBST(ML_BUILD)
385    
386    dnl ******************** Documentation tools ********************
387    
388    dnl check for doxygen
389    dnl
390    AC_ARG_WITH([doxygen],
391      [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
392      [DOXYGEN=$with_doxygen],
393      [DOXYGEN=none])
394    if test x$DOXYGEN = xnone ; then
395      # see if we can find doxygen in the user's path
396      AC_PATH_PROG(DOXYGEN, [doxygen], [none])
397    fi
398    if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
399      AC_MSG_ERROR([--with-doxygen option must specify directory argument])
400    elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
401      AC_MSG_ERROR([doxygen not found at $DOXYGEN])
402    elif test x$DOXYGEN != xnone ; then
403    dnl
404    dnl verify that $DOXYGEN is an absolute path
405    dnl
406      case $DOXYGEN in
407        /*) ;;
408        *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
409      esac
410    fi
411    if test $DOXYGEN = xnone ; then
412      DOXYGEN=:
413    fi
414    AC_SUBST(DOXYGEN)
415    
416    dnl check for asciidoc and related tools
417    dnl
418    AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
419    AC_PATH_PROGS([A2X], [a2x], [none])
420    AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])
421    AC_PATH_PROGS([DBLATEX], [dblatex], [none])
422    
423    dnl
424    dnl get the path to the asciidoc cofiguration files
425    dnl
426    if test x"$ASCIIDOC" != xnone ; then
427      AC_MSG_CHECKING([path to asciidoc configuration files])
428      ASCIIDOC_CONF_DIR=`$ASCIIDOC -v /dev/null 2>&1 | head -n 1 | sed 's|.*reading: \(.*\)/asciidoc.conf|\1|'`
429      AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
430    fi
431    AC_SUBST(ASCIIDOC)
432    AC_SUBST(A2X)
433    AC_SUBST(ASCIIDOC_CONF_DIR)
434    AC_SUBST(HIGHLIGHTER)
435    AC_SUBST(DBLATEX)
436    
437    
438  dnl ******************** Paths ********************  dnl ******************** Paths ********************
439    
440  DIDEROT_ROOT=`pwd`  DIDEROT_ROOT=`pwd`
# Line 483  Line 509 
509    
510  AH_TOP([  AH_TOP([
511  /*  /*
512   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * COPYRIGHT (c) 2014 Diderot project. (http://diderot-language.cs.uchicago.edu)
513   * All rights reserved.   * All rights reserved.
514   */   */
515    
# Line 511  Line 537 
537  dnl ***** Makefiles *****  dnl ***** Makefiles *****
538    Makefile    Makefile
539    doc/Makefile    doc/Makefile
540      doc/man/Makefile
541    src/clinfo/Makefile    src/clinfo/Makefile
   src/dnorm/Makefile  
542    src/compiler/Makefile    src/compiler/Makefile
543    src/lib/build/Makefile    src/lib/build/Makefile
544    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
# Line 520  Line 546 
546    test/probe/Makefile    test/probe/Makefile
547  dnl  dnl
548  dnl ***** SML source files *****  dnl ***** SML source files *****
549    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in
550    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
551    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
552  )  )

Legend:
Removed from v.2377  
changed lines
  Added in v.2604

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