* bootstrap (check_versions): Handle automake and aclocal from
Automake-NG specially. They can be specified as respectively
the "automake-ng" and "aclocal-ng" requirements.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>
---
build-aux/bootstrap | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 5aa73cc..c0960f5 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-04-19.22; # UTC
+scriptversion=2012-04-23.22; # UTC
# Bootstrap this package from checked-out sources.
@@ -433,6 +433,21 @@ check_versions() {
GZIP) ;; # Do not use $GZIP: it contains gzip options.
*) eval "app=\${$appvar-$app}" ;;
esac
+ # Special handling for (still experimental) Automake-NG programs.
+ # They remain named as the mainstream Automake programs ("automake",
+ # and "aclocal") to avoid gratuitous incompatibilities with
+ # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+ # scripts), but correctly identify themselves (as being part of
+ # "GNU automake-ng") when asked their version.
+ case $app in
+ automake-ng|aclocal-ng)
+ app=`echo "$app" | sed 's/-ng$//'`
+ ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || {
+ echo "$me: Error: '$app' not found or not from Automake-NG" >&2
+ ret=1
+ continue
+ } ;;
+ esac
if [ "$req_ver" = "-" ]; then
# Merely require app to exist; not all prereq apps are well-behaved
# so we have to rely on $? rather than get_version.
--
1.7.9.5
