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

SCM Repository

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

Diff of /branches/vis12/configure.ac

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

revision 2440, Tue Sep 24 19:10:31 2013 UTC revision 2441, Wed Sep 25 17:00:08 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 411  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([HIGHLIGHTER], [pygmentize], [none])
420    AC_PATH_PROGS([DBLATEX], [dblatex], [none])
421    
422    dnl
423    dnl get the path to the asciidoc cofiguration files
424    dnl
425    if test x"$ASCIIDOC" != xnone ; then
426      AC_MSG_CHECKING([path to asciidoc configuration files])
427      ASCIIDOC_CONF_DIR=`$ASCIIDOC -v /dev/null 2>&1 | head -n 1 | sed 's|.*reading: \(.*\)/asciidoc.conf|\1|'`
428      AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
429    fi
430    AC_SUBST(ASCIIDOC)
431    AC_SUBST(ASCIIDOC_CONF_DIR)
432    AC_SUBST(HIGHLIGHTER)
433    AC_SUBST(DBLATEX)
434    
435    
436  dnl ******************** Paths ********************  dnl ******************** Paths ********************
437    
438  DIDEROT_ROOT=`pwd`  DIDEROT_ROOT=`pwd`
# Line 513  Line 535 
535  dnl ***** Makefiles *****  dnl ***** Makefiles *****
536    Makefile    Makefile
537    doc/Makefile    doc/Makefile
538      doc/man/Makefile
539    src/clinfo/Makefile    src/clinfo/Makefile
540    src/compiler/Makefile    src/compiler/Makefile
541    src/lib/build/Makefile    src/lib/build/Makefile

Legend:
Removed from v.2440  
changed lines
  Added in v.2441

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