From 72d66bc405c12e1d2ad1ed1198ff3e98f772cae5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 18 Jan 2002 21:12:54 +0000 Subject: [PATCH] * missing: Updated. * lib/missing: Accept versioned aclocal. * m4/init.m4 (AM_INIT_AUTOMAKE): Look for versioned aclocal. --- ChangeLog | 6 ++++++ lib/missing | 2 +- m4/init.m4 | 2 +- missing | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f30d578d..7effd0a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-01-18 Tom Tromey + + * missing: Updated. + * lib/missing: Accept versioned aclocal. + * m4/init.m4 (AM_INIT_AUTOMAKE): Look for versioned aclocal. + 2002-01-17 Pavel Roskin * m4/Makefile.am (m4datadir): Use APIVERSION. diff --git a/lib/missing b/lib/missing index adc6ebc1..dd583709 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 2d366894..a7e018e5 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 adc6ebc1..dd583709 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 -- 2.43.5