* automake.in (scan_one_autoconf_file): Don't treat AC_CHECK_TOOL

as AC_CANONICAL_HOST (the former does not require the latter since
Autoconf 2.50).
* m4/strip.m4 (AM_PROG_INSTALL_STRIP): Check for strip.
* automake.texi (Requirements): Do not require STRIP to be
defined by the user.

diff --git a/ChangeLog b/ChangeLog
index c12eb70..b529390 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-24  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (scan_one_autoconf_file): Don't treat AC_CHECK_TOOL
+       as AC_CANONICAL_HOST (the former does not require the latter since
+       Autoconf 2.50).
+       * m4/strip.m4 (AM_PROG_INSTALL_STRIP): Check for strip.
+       * automake.texi (Requirements): Do not require STRIP to be
+       defined by the user.
+
 2002-01-23  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIRS).

diff --git a/NEWS b/NEWS
index 7211783..b6897c9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ New in 1.5c:
   first argument to this new form of AM_INIT_AUTOMAKE.
 * Compiler-based assembler is now called `CCAS'; people expected `AS'
   to be a real assembler.
+* AM_INIT_AUTOMAKE will set STRIP itself when it needs it.  Adding
+  AC_CHECK_TOOL([STRIP], [strip]) manually is no longuer required.
 \f
 New in 1.5:
 * Support for `configure.ac'.

diff --git a/automake.in b/automake.in
index 967b03a..e211048 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4857,8 +4857,7 @@ sub scan_one_autoconf_file
 
         # Handle AC_CANONICAL_*.  Always allow upgrading to
         # AC_CANONICAL_SYSTEM, but never downgrading.
-       if (/AC_CANONICAL_HOST/ || /AC_CHECK_TOOL/
-            || /AC_CYGWIN/ || /AC_EMXOS2/ || /AC_MINGW32/)
+       if (/AC_CANONICAL_HOST/ || /AC_CYGWIN/ || /AC_EMXOS2/ || /AC_MINGW32/)
          {
            if (! $seen_canonical)
              {

diff --git a/automake.texi b/automake.texi
index 6e5c8e9..572ef49 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1053,25 +1053,6 @@ are removed by @code{make clean}.
 @cvindex AC_OUTPUT
 @end table
 
-You may need the following macros in some conditions, even though they
-are not required.
-
-@table @code
-@item AC_CHECK_TOOL([STRIP],[strip])
-@cindex STRIP, how to setup
-@cindex install-strip and STRIP
-@cvindex AC_CHECK_TOOL([STRIP],[strip])
-Installed binaries are usually stripped using @code{strip} when you run
-@code{make install-strip}.  However @code{strip} might not be the
-right tool to use in cross-compilation environments, therefore
-Automake will honor the @code{STRIP} environment variable to overrule
-the program used to perform stripping.  Automake will not set @code{STRIP}
-itself.  If your package is not setup for cross-compilation you do not
-have to care (@code{strip} is ok), otherwise you can set @code{STRIP}
-automatically by calling @code{AC_CHECK_TOOL([STRIP],[strip])} from
-your @file{configure.in}.
-@end table
-
 
 @node Optional, Invoking aclocal, Requirements, configure
 @section Other things Automake recognizes

diff --git a/m4/strip.m4 b/m4/strip.m4
index 2362302..85182eb 100644 (file)
--- a/m4/strip.m4
+++ b/m4/strip.m4
@@ -26,5 +26,13 @@
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])