diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 |
4 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2007-11-30 Ralf Hemmecke <ralf@hemmecke.de> + + * configure.ac.pamphlet: Fix a thinko in checking for makeindex. + 2007-11-25 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet: Remove all-depsys rule. @@ -20378,8 +20378,10 @@ echo "${ECHO_T}no" >&6; } fi -# Extract the first word of "makeindex", so it can be a program name with args. -set dummy makeindex; ac_word=$2 +for ac_prog in makeindex +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_MAKEINDEX+set}" = set; then @@ -20395,7 +20397,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MAKEINDEX="" + ac_cv_prog_MAKEINDEX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -20415,6 +20417,9 @@ echo "${ECHO_T}no" >&6; } fi + test -n "$MAKEINDEX" && break +done + if test -n "$LATEX"; then \ axiom_src_all="$axiom_src_all all-book" axiom_src_subdirs="$axiom_src_subdirs booklets" diff --git a/configure.ac b/configure.ac index 57d03427..6bef65fe 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,7 @@ esac AC_CHECK_PROG([AR], [ar], [ar], [AC_MSG_ERROR([program 'ar' is missing])]) AC_PATH_PROG([LATEX], [latex]) -AC_CHECK_PROG([MAKEINDEX], [makeindex]) +AC_CHECK_PROGS([MAKEINDEX], [makeindex]) if test -n "$LATEX"; then \ axiom_src_all="$axiom_src_all all-book" axiom_src_subdirs="$axiom_src_subdirs booklets" diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 4b2ed3be..29612d2b 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -701,7 +701,7 @@ this works right when one follows the installation instructions. % <<doc utils>>= AC_PATH_PROG([LATEX], [latex]) -AC_CHECK_PROG([MAKEINDEX], [makeindex]) +AC_CHECK_PROGS([MAKEINDEX], [makeindex]) if test -n "$LATEX"; then \ axiom_src_all="$axiom_src_all all-book" axiom_src_subdirs="$axiom_src_subdirs booklets" |