* missing: Updated.

	* lib/missing: Accept versioned aclocal.
	* m4/init.m4 (AM_INIT_AUTOMAKE): Look for versioned aclocal.

diff --git a/ChangeLog b/ChangeLog
index f30d578d91e63d7a3a8143746efaca8f81701f13..7effd0a9fa3e4d0a8bbe6da15800c257d88c4706 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-18  Tom Tromey  <tromey@redhat.com>
+
+       * missing: Updated.
+       * lib/missing: Accept versioned aclocal.
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Look for versioned aclocal.
+
 2002-01-17  Pavel Roskin  <proski@gnu.org>
 
        * m4/Makefile.am (m4datadir): Use APIVERSION.

diff --git a/lib/missing b/lib/missing
index adc6ebc1b19dd1b2f554fc7ee23f86468caafd90..dd583709f535918128e0f8d3b6a4fddf64c87cec 100755 (executable)
--- a/lib/missing
+++ b/lib/missing
@@ -87,7 +87,7 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal)
+  aclocal*)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1

diff --git a/m4/init.m4 b/m4/init.m4
index 2d36689449066e628044b34eb22dff6dac2c19c3..a7e018e50ee8c71b208c0fa0d2f244f828e4bba0 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -73,7 +73,7 @@ _AM_IF_OPTION([no-define],,
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal)
+AM_MISSING_PROG(ACLOCAL, "aclocal-${am__api_version}")
 AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}")
 AM_MISSING_PROG(AUTOHEADER, autoheader)

diff --git a/missing b/missing
index adc6ebc1b19dd1b2f554fc7ee23f86468caafd90..dd583709f535918128e0f8d3b6a4fddf64c87cec 100755 (executable)
--- a/missing
+++ b/missing
@@ -87,7 +87,7 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal)
+  aclocal*)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
        exit 1