aclocal.m4: Work around a bug in AC_PATH_PROGS when its last argument is empty.

	* aclocal.m4: Work around a bug in AC_PATH_PROGS when its last
	argument is empty.
	* configure: Regenerate.

From-SVN: r101664

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09f1c17c02406ed4aee133a64516fbb5e2b1ccec..396befc69afc7ceea236607c4f753c33c0873771 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-06  Paul Brook  <paul@codesourcery.com>
+
+       * aclocal.m4: Work around a bug in AC_PATH_PROGS when its last
+       argument is empty.
+       * configure: Regenerate.
+
 2005-07-06  J"orn Rennecke <joern.rennecke@st.com>
 
        * sh.c (final_prescan_insn): Undo bogus change from 2005-05-09.

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index da6e38a780b6d4300c4e7f6cc93b84790b56e203..6c12bfb458cd3bb9bed452e43e84c02e44978c58 100644 (file)
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -711,7 +711,13 @@ dnl shut up useless "checking for..." messages
 dnl we can still read them in config.log
 exec AS_MESSAGE_FD([])>/dev/null
 if test "x[$]$1" = x; then
-       AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs)
+       # The AC_PATH_PROGS macro doesn't work properly when its 4th argument
+       # is empty.
+       if test "x$gcc_cv_tool_dirs" = x; then
+               $1=
+       else
+               AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs)
+       fi
 fi
 if test "x[$]$1" = x; then
        # If the loop above did not find a tool, then use whatever

diff --git a/gcc/configure b/gcc/configure
index 36112760c9b270f01e1890af10387fed0713917d..55015f6466a5d3d8a110d7a8fce90c09265990ec 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -12896,7 +12896,12 @@ fi
 
 exec 6>/dev/null
 if test "x$gcc_cv_as" = x; then
-       for ac_prog in as
+       # The AC_PATH_PROGS macro doesn't work properly when its 4th argument
+       # is empty.
+       if test "x$gcc_cv_tool_dirs" = x; then
+               gcc_cv_as=
+       else
+               for ac_prog in as
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -12940,6 +12945,7 @@ fi
   test -n "$gcc_cv_as" && break
 done
 
+       fi
 fi
 if test "x$gcc_cv_as" = x; then
        # If the loop above did not find a tool, then use whatever
@@ -13068,7 +13074,12 @@ fi
 
 exec 6>/dev/null
 if test "x$gcc_cv_ld" = x; then
-       for ac_prog in ld
+       # The AC_PATH_PROGS macro doesn't work properly when its 4th argument
+       # is empty.
+       if test "x$gcc_cv_tool_dirs" = x; then
+               gcc_cv_ld=
+       else
+               for ac_prog in ld
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -13112,6 +13123,7 @@ fi
   test -n "$gcc_cv_ld" && break
 done
 
+       fi
 fi
 if test "x$gcc_cv_ld" = x; then
        # If the loop above did not find a tool, then use whatever
@@ -13206,7 +13218,12 @@ fi
 
 exec 6>/dev/null
 if test "x$gcc_cv_nm" = x; then
-       for ac_prog in nm
+       # The AC_PATH_PROGS macro doesn't work properly when its 4th argument
+       # is empty.
+       if test "x$gcc_cv_tool_dirs" = x; then
+               gcc_cv_nm=
+       else
+               for ac_prog in nm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -13250,6 +13267,7 @@ fi
   test -n "$gcc_cv_nm" && break
 done
 
+       fi
 fi
 if test "x$gcc_cv_nm" = x; then
        # If the loop above did not find a tool, then use whatever