diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-10-14 00:51:46 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-10-14 00:51:46 +0000 |
| commit | 95bc3ca0a7ebfa9173a31462ff2dfa62a80d1b33 (patch) | |
| tree | 8c444dfb55465678c2456d8c155fe0c7c5870abe | |
| parent | 6e828a6113b3a714f37de4e8d4f2a12c6d0bec5e (diff) | |
| download | open-axiom-95bc3ca0a7ebfa9173a31462ff2dfa62a80d1b33.tar.gz | |
| -rwxr-xr-x | configure | 32 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 8 |
3 files changed, 27 insertions, 21 deletions
@@ -824,8 +824,8 @@ AXIOM_LISP NOWEAVE NOTANGLE MAKEINDEX -PDFLATEX LATEX +PDFLATEX HOST_AWK AWK MKTEMP @@ -11764,7 +11764,21 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_PDFLATEX" && ac_cv_path_PDFLATEX="# Extract the first word of "latex", so it can be a program name with args. + ;; +esac +fi +PDFLATEX=$ac_cv_path_PDFLATEX +if test -n "$PDFLATEX"; then + { $as_echo "$as_me:$LINENO: result: $PDFLATEX" >&5 +$as_echo "$PDFLATEX" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test -z $PDFLATEX; then + # Extract the first word of "latex", so it can be a program name with args. set dummy latex; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -11805,20 +11819,8 @@ else $as_echo "no" >&6; } fi -" - ;; -esac -fi -PDFLATEX=$ac_cv_path_PDFLATEX -if test -n "$PDFLATEX"; then - { $as_echo "$as_me:$LINENO: result: $PDFLATEX" >&5 -$as_echo "$PDFLATEX" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - +fi for ac_prog in makeindex do diff --git a/configure.ac b/configure.ac index c2ca0a1b..0c7c57c2 100644 --- a/configure.ac +++ b/configure.ac @@ -118,9 +118,11 @@ AC_PATH_PROGS([HOST_AWK],[awk nawk gawk mawk]) AC_CHECK_PROG([AR], [ar], [ar], [AC_MSG_ERROR([program 'ar' is missing])]) -AC_PATH_PROG([PDFLATEX], [pdflatex], - [AC_PATH_PROG([LATEX], [latex], - [AC_MSG_NOTICE([Documentation is disabled.])])]) +AC_PATH_PROG([PDFLATEX], [pdflatex]) +if test -z $PDFLATEX; then + AC_PATH_PROG([LATEX], [latex], + [AC_MSG_NOTICE([Documentation is disabled.])]) +fi AC_CHECK_PROGS([MAKEINDEX], [makeindex]) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index a7aa67f1..1f6e5a8e 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -737,9 +737,11 @@ files in a directory named \File{noweb/} at the top level. Normally, this works right when one follows the installation instructions. % <<doc utils>>= -AC_PATH_PROG([PDFLATEX], [pdflatex], - [AC_PATH_PROG([LATEX], [latex], - [AC_MSG_NOTICE([Documentation is disabled.])])]) +AC_PATH_PROG([PDFLATEX], [pdflatex]) +if test -z $PDFLATEX; then + AC_PATH_PROG([LATEX], [latex], + [AC_MSG_NOTICE([Documentation is disabled.])]) +fi AC_CHECK_PROGS([MAKEINDEX], [makeindex]) |