(AC_CHECK_TOOL_PREFIX): Require AC_CANONICAL_BUILD, so both $build and

$host are definitely set before we compare them.

diff --git a/acgeneral.m4 b/acgeneral.m4
index ede0417520ce7daa811a829d5835450c38eabbca..663c4a249c4481e711b3c05289fbd6b7e854b516 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1160,7 +1160,7 @@ ifelse([$3], , , [test -n "[$]$1" || $1="$3"
 
 dnl Internal subroutine.
 AC_DEFUN(AC_CHECK_TOOL_PREFIX,
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+[AC_REQUIRE([AC_CANONICAL_HOST])AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 if test $host != $build; then
   ac_tool_prefix=${host_alias}-
 else

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index ede0417520ce7daa811a829d5835450c38eabbca..663c4a249c4481e711b3c05289fbd6b7e854b516 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1160,7 +1160,7 @@ ifelse([$3], , , [test -n "[$]$1" || $1="$3"
 
 dnl Internal subroutine.
 AC_DEFUN(AC_CHECK_TOOL_PREFIX,
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+[AC_REQUIRE([AC_CANONICAL_HOST])AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 if test $host != $build; then
   ac_tool_prefix=${host_alias}-
 else