From: Tom Tromey <tromey@redhat.com>
Date: Fri, 18 Jan 2002 21:12:55 +0000 (+0000)
Subject: 	* missing: Updated.
X-Git-Tag: Release-1-5d~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c52e0530f0db2ab4bfdd5b0d62c4403440a67e51;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index f30d578d9..7effd0a9f 100644
--- 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 adc6ebc1b..dd583709f 100755
--- 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 2d3668944..a7e018e50 100644
--- 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 adc6ebc1b..dd583709f 100755
--- 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