diff --git a/ChangeLog b/ChangeLog
index 3dd05d0c..2db1974e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-06-19  Steven G. Johnson  <stevenj@gil-galad.mit.edu>
+
+	* acgeneral.m4 (AC_CHECK_TOOL): Use two variables in order to
+	avoid cache variable conflicts between AC_CHECK_PROG invocations.
+	(AC_PATH_TOOL): Fix same bugs as in 6/9/00 fixes to AC_CHECK_TOOL.
+	Pass correct arguments to AC_CHECK_PATH (different from
+	AC_CHECK_PROG).  Use AC_CHECK_PATH cache variable, not
+	AC_CHECK_PROG var, and use two variables for two invocations as
+	above.  Quote AC_CHECK_* args.
+
 2000-06-16  Akim Demaille  <akim@epita.fr>
 
 	The test suite reveals AC_OUTPUT_MAKE_DEFS fails on RISC/OS.
diff --git a/acgeneral.m4 b/acgeneral.m4
index cf7af324..801979b1 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2597,27 +2597,29 @@ AU_DEFUN([AC_CHECK_TOOL_PREFIX])
 
 # AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
 # -----------------------------------------------------------------------
+# (Use different variables $1 and ac_pt_$1 so that cache vars don't conflict.)
 AC_DEFUN([AC_PATH_TOOL],
-[AC_PATH_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
-             ifelse([$3], , [$2]), $4)
-ifval([$3], [
-if test -z "$ac_cv_prog_$1"; then
+[AC_PATH_PROG($1, ${ac_tool_prefix}$2, , $4)
+if test -z "$ac_cv_path_$1"; then
   if test -n "$ac_tool_prefix"; then
-    AC_PATH_PROG($1, $2, $2, $3)
+    AC_PATH_PROG([ac_pt_$1], [$2], [$3], [$4])
+    $1="$ac_pt_$1"
   else
     $1="$3"
   fi
-fi])
+fi
 ])
 
 
 # AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
 # ------------------------------------------------------------------------
+# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
 AC_DEFUN([AC_CHECK_TOOL],
 [AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, , $4)
 if test -z "$ac_cv_prog_$1"; then
   if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG($1, $2, $2, $3, $4)
+    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
+    $1="$ac_ct_$1"
   else
     $1="$3"
   fi
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index cf7af324..801979b1 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2597,27 +2597,29 @@ AU_DEFUN([AC_CHECK_TOOL_PREFIX])
 
 # AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
 # -----------------------------------------------------------------------
+# (Use different variables $1 and ac_pt_$1 so that cache vars don't conflict.)
 AC_DEFUN([AC_PATH_TOOL],
-[AC_PATH_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2,
-             ifelse([$3], , [$2]), $4)
-ifval([$3], [
-if test -z "$ac_cv_prog_$1"; then
+[AC_PATH_PROG($1, ${ac_tool_prefix}$2, , $4)
+if test -z "$ac_cv_path_$1"; then
   if test -n "$ac_tool_prefix"; then
-    AC_PATH_PROG($1, $2, $2, $3)
+    AC_PATH_PROG([ac_pt_$1], [$2], [$3], [$4])
+    $1="$ac_pt_$1"
   else
     $1="$3"
   fi
-fi])
+fi
 ])
 
 
 # AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
 # ------------------------------------------------------------------------
+# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
 AC_DEFUN([AC_CHECK_TOOL],
 [AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, , $4)
 if test -z "$ac_cv_prog_$1"; then
   if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG($1, $2, $2, $3, $4)
+    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
+    $1="$ac_ct_$1"
   else
     $1="$3"
   fi