Fix AC_*_TARGET_TOOL macros.

* lib/autoconf/programs.m4 (AC_PATH_TARGET_TOOL)
(AC_CHECK_TARGET_TOOL, AC_CHECK_TARGET_TOOLS): Require, do not
warn about previous AC_CANONICAL_TARGET.
(AC_CHECK_TARGET_TOOL): Add missing `$' making the macro
unusable in the non-cross-compiling case.
* NEWS, THANKS: Update.
Report by Dave Erickson.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index aa824655e0b67e18c7c365ae670ff38e27f9c636..a2e209f5a0220241a36cca7aae7cad28ee76d49c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/programs.m4 (AC_PATH_TARGET_TOOL)
+       (AC_CHECK_TARGET_TOOL, AC_CHECK_TARGET_TOOLS): Require, do not
+       warn about previous AC_CANONICAL_TARGET.
+       (AC_CHECK_TARGET_TOOL): Add missing `$' making the macro
+       unusable in the non-cross-compiling case.
+       * NEWS, THANKS: Update.
+       Report by Dave Erickson.
+
 2008-08-12  Eric Blake  <ebb9@byu.net>
 
        Optimize m4_bmatch.

diff --git a/NEWS b/NEWS
index 2cf67471d4584e55151a800cc4b0134a229ba3c3..30116971641961de84bfb807968f12ea105b57d0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ GNU Autoconf NEWS - User visible changes.
    2.62 when using macros such as AC_AIX that were made obsolete in
    favor of the more portable AC_USE_SYSTEM_EXTENSIONS.
 
+** AC_CHECK_TARGET_TOOLS is usable in the non-cross-compile case.
+
 ** Newly obsolete macros
    The following macro has been marked obsolete, since current porting
    targets can safely assume C89 semantics that signal handlers return

diff --git a/THANKS b/THANKS
index 7b903a9f079a742023849eb76eee912bdf35453f..906ed171a8ac8c9b8f1f28ec5eeee61f6cb98a2f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -76,6 +76,7 @@ Daniel Jacobowitz           drow@mvista.com
 Daniel Reed                 ?
 Daniele Arena               daniele@ripe.net
 Dave Adams                  adams@hpesdwa.fc.hp.com
+Dave Erickson               retrorandomaccess@hotmail.com
 Dave Love                   fx@gnu.org
 David Byron                 dbyron@hheld.com
 David Carter                david@carter.net

diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index e7e72c0057321e795b20d29c8e574f658a077c4b..f2245fbc9e58a0d61206ae5688a3f41a9bb4c2e0 100644 (file)
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -291,10 +291,10 @@ fi
 
 
 # AC_PATH_TARGET_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_TARGET_TOOL],
-[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
+[AC_REQUIRE([AC_CANONICAL_TARGET])dnl
 AC_PATH_PROG([$1], [$target_alias-$2], , [$4])
 if test -z "$ac_cv_path_$1"; then
   if test "$build" = "$target"; then
@@ -311,16 +311,16 @@ fi
 
 
 # AC_CHECK_TARGET_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_TARGET_TOOL],
-[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
+[AC_REQUIRE([AC_CANONICAL_TARGET])dnl
 AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
 if test -z "$ac_cv_prog_$1"; then
   if test "$build" = "$target"; then
     ac_ct_$1=$$1
     _AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
-    $1=ac_ct_$1
+    $1=$ac_ct_$1
   else
     $1="$3"
   fi
@@ -332,12 +332,12 @@ fi
 
 # AC_CHECK_TARGET_TOOLS(VARIABLE, PROGS-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND],
 #                      [PATH])
-# ------------------------------------------------------------------
+# -------------------------------------------------------------------------
 # Check for each tool in PROGS-TO-CHECK-FOR with the cross prefix. If
 # none can be found with a cross prefix, then use the first one that
 # was found without the cross prefix.
 AC_DEFUN([AC_CHECK_TARGET_TOOLS],
-[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
+[AC_REQUIRE([AC_CANONICAL_TARGET])dnl
 for ac_prog in $2
 do
   AC_CHECK_PROG([$1],