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 2430, Thu Sep 19 21:41:27 2013 UTC revision 2457, Tue Oct 8 19:14:09 2013 UTC
# 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 356  Line 328 
328      TEEM_DIR=$ac_cv_use_teem      TEEM_DIR=$ac_cv_use_teem
329      # check that TEEM_DIR actually points to something that looks like teem      # check that TEEM_DIR actually points to something that looks like teem
330      if test -f $TEEM_DIR/include/teem/nrrd.h ; then      if test -f $TEEM_DIR/include/teem/nrrd.h ; then
331        AC_MSG_RESULT([ okay])        AC_MSG_RESULT([yes])
332      else      else
333        TEEM_DIR=none        TEEM_DIR=none
334        AC_MSG_RESULT([ invalid])        AC_MSG_RESULT([no])
335      fi      fi
336    else    else
337      TEEM_DIR=none      TEEM_DIR=none
338      AC_MSG_RESULT([ invalid])      AC_MSG_RESULT([no])
339    fi    fi
340  fi  fi
341  if test x"$TEEM_DIR" = xnone ; then  if test x"$TEEM_DIR" = xnone ; then
342    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])    AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])
343  fi  fi
344    dnl
345    dnl check that unu supports the dnorm command
346    dnl
347    if test x"$TEEM_DIR" != xnone ; then
348      AC_MSG_CHECKING([that \"unu dnorm\" works])
349      if test -x $TEEM_DIR/bin/unu ; then
350        $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null
351        if test $? -eq 0 ; then
352          AC_MSG_RESULT([yes])
353        else
354          AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])
355        fi
356      else
357        AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])
358      fi
359    fi
360  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
361    
362  dnl ******************** SML/NJ configuration ********************  dnl ******************** SML/NJ configuration ********************
# Line 378  Line 366 
366  dnl  dnl
367  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])])
368  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
369    -o $SMLNJ_MINOR_VERSION -lt 74    -o $SMLNJ_MINOR_VERSION -lt 75
370  then  then
371    AC_MSG_ERROR([installation requires SML/NJ version 110.74+])    AC_MSG_ERROR([installation requires SML/NJ version 110.75+])
372  fi  fi
373  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
374    
# Line 411  Line 399 
399  fi  fi
400  AC_SUBST(ML_BUILD)  AC_SUBST(ML_BUILD)
401    
402    dnl ******************** Documentation tools ********************
403    
404    dnl check for doxygen
405    dnl
406    AC_ARG_WITH([doxygen],
407      [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
408      [DOXYGEN=$with_doxygen],
409      [DOXYGEN=none])
410    if test x$DOXYGEN = xnone ; then
411      # see if we can find doxygen in the user's path
412      AC_PATH_PROG(DOXYGEN, [doxygen], [none])
413    fi
414    if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
415      AC_MSG_ERROR([--with-doxygen option must specify directory argument])
416    elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
417      AC_MSG_ERROR([doxygen not found at $DOXYGEN])
418    elif test x$DOXYGEN != xnone ; then
419    dnl
420    dnl verify that $DOXYGEN is an absolute path
421    dnl
422      case $DOXYGEN in
423        /*) ;;
424        *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
425      esac
426    fi
427    if test $DOXYGEN = xnone ; then
428      DOXYGEN=:
429    fi
430    AC_SUBST(DOXYGEN)
431    
432    dnl check for asciidoc and related tools
433    dnl
434    AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
435    AC_PATH_PROGS([A2X], [a2x], [none])
436    AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])
437    AC_PATH_PROGS([DBLATEX], [dblatex], [none])
438    
439    dnl
440    dnl get the path to the asciidoc cofiguration files
441    dnl
442    if test x"$ASCIIDOC" != xnone ; then
443      AC_MSG_CHECKING([path to asciidoc configuration files])
444      ASCIIDOC_CONF_DIR=`$ASCIIDOC -v /dev/null 2>&1 | head -n 1 | sed 's|.*reading: \(.*\)/asciidoc.conf|\1|'`
445      AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
446    fi
447    AC_SUBST(ASCIIDOC)
448    AC_SUBST(A2X)
449    AC_SUBST(ASCIIDOC_CONF_DIR)
450    AC_SUBST(HIGHLIGHTER)
451    AC_SUBST(DBLATEX)
452    
453    
454  dnl ******************** Paths ********************  dnl ******************** Paths ********************
455    
456  DIDEROT_ROOT=`pwd`  DIDEROT_ROOT=`pwd`
# Line 513  Line 553 
553  dnl ***** Makefiles *****  dnl ***** Makefiles *****
554    Makefile    Makefile
555    doc/Makefile    doc/Makefile
556      doc/man/Makefile
557    src/clinfo/Makefile    src/clinfo/Makefile
558    src/compiler/Makefile    src/compiler/Makefile
559    src/lib/build/Makefile    src/lib/build/Makefile

Legend:
Removed from v.2430  
changed lines
  Added in v.2457

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