aclocal.m4 (gcc_AC_CHECK_TOOL): Do not overwrite the passed variable.

2005-06-17  Paolo Bonzini  <bonzini@gnu.org>

	* aclocal.m4 (gcc_AC_CHECK_TOOL): Do not overwrite the
	passed variable.

From-SVN: r101127

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 29ec313a622de94c86141ea2b9c107c81b6093dd..4451476e364a451a6363ea1c966edfd174ed2817 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-17  Paolo Bonzini  <bonzini@gnu.org>
+
+       * aclocal.m4 (gcc_AC_CHECK_TOOL): Do not overwrite the
+       passed variable.
+       * configure.ac: Regenerate.
+
 2005-06-17  Jan Hubicka  <jh@suse.cz>
 
        * tree-optimize.c (execute_ipa_pass_list): New.

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index b180c1b9513e274b6bb09ba608e1a2fd38b1e4ec..59e5845fa132cf4a3d3eb48ec216e52177d646f5 100644 (file)
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -710,7 +710,9 @@ AC_REQUIRE([gcc_AC_BUILD_EXEEXT])
 dnl shut up useless "checking for..." messages
 dnl we can still read them in config.log
 exec AS_MESSAGE_FD([])>/dev/null
-AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs)
+if test "x[$]$1" = x; then
+       AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs)
+fi
 if test "x[$]$1" = x; then
        # If the loop above did not find a tool, then use whatever
        # one we can find in the users's path.  We are looking for a

diff --git a/gcc/configure b/gcc/configure
index a5e04ec1c7921e347c524469add96e68d6b95837..f557c2de9218748d9bdd2ccd0d175fb5a5f6837f 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -12895,7 +12895,8 @@ fi
 
 
 exec 6>/dev/null
-for ac_prog in as
+if test "x$gcc_cv_as" = x; then
+       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
@@ -12939,6 +12940,7 @@ fi
   test -n "$gcc_cv_as" && break
 done
 
+fi
 if test "x$gcc_cv_as" = x; then
        # If the loop above did not find a tool, then use whatever
        # one we can find in the users's path.  We are looking for a
@@ -13065,7 +13067,8 @@ fi
 
 
 exec 6>/dev/null
-for ac_prog in ld
+if test "x$gcc_cv_ld" = x; then
+       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
@@ -13109,6 +13112,7 @@ fi
   test -n "$gcc_cv_ld" && break
 done
 
+fi
 if test "x$gcc_cv_ld" = x; then
        # If the loop above did not find a tool, then use whatever
        # one we can find in the users's path.  We are looking for a
@@ -13201,7 +13205,8 @@ fi
 
 
 exec 6>/dev/null
-for ac_prog in nm
+if test "x$gcc_cv_nm" = x; then
+       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
@@ -13245,6 +13250,7 @@ fi
   test -n "$gcc_cv_nm" && break
 done
 
+fi
 if test "x$gcc_cv_nm" = x; then
        # If the loop above did not find a tool, then use whatever
        # one we can find in the users's path.  We are looking for a