(AC_CHECK_TOOL): Rewritten. Take optional third arg VALUE-IF-NOT-FOUND.

Check for ${ac_tool_prefix}PROG-TO-CHECK-FOR first.  If not found and third
arg given, and ${ac_tool_prefix} is nonempty, check for unadorned
PROG-TO-CHECK-FOR as well.  Last choice use VALUE-IF-NOT-FOUND.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 61af8328fef76b613e51b27be5a49c76b1cf3853..ede0417520ce7daa811a829d5835450c38eabbca 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1168,10 +1168,19 @@ else
 fi
 ])
 
-dnl AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR)
+dnl AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND])
 AC_DEFUN(AC_CHECK_TOOL,
 [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, $2)
+AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, 
+             ifelse([$3], , [$2], ))
+ifelse([$3], , , [
+if test -z "$ac_cv_prog_$1"; then
+if test -n "$ac_tool_prefix"; then
+  AC_CHECK_PROG($1, $2, $2, $3)
+else
+  $1="$3"
+fi
+fi])
 ])
 
 dnl Guess the value for the `prefix' variable by looking for

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 61af8328fef76b613e51b27be5a49c76b1cf3853..ede0417520ce7daa811a829d5835450c38eabbca 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1168,10 +1168,19 @@ else
 fi
 ])
 
-dnl AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR)
+dnl AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND])
 AC_DEFUN(AC_CHECK_TOOL,
 [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, $2)
+AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, 
+             ifelse([$3], , [$2], ))
+ifelse([$3], , , [
+if test -z "$ac_cv_prog_$1"; then
+if test -n "$ac_tool_prefix"; then
+  AC_CHECK_PROG($1, $2, $2, $3)
+else
+  $1="$3"
+fi
+fi])
 ])
 
 dnl Guess the value for the `prefix' variable by looking for