aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-10-16 01:38:59 +0000
committerMike Frysinger <vapier@gentoo.org>2006-10-16 01:38:59 +0000
commitaa915853509a1ae605d301989b983722cf82ce6b (patch)
tree756e9094ed2166fa294f871a1845ffbd8d3697cf
parentuse gawk, not awk #92582 (diff)
downloadautotools-wrappers-aa915853509a1ae605d301989b983722cf82ce6b.tar.gz
autotools-wrappers-aa915853509a1ae605d301989b983722cf82ce6b.tar.bz2
autotools-wrappers-aa915853509a1ae605d301989b983722cf82ce6b.zip
Include support for automake-1.10.am-2
Package-Manager: portage-2.1.2_pre2-r9
-rwxr-xr-xam-wrapper.sh22
1 files changed, 14 insertions, 8 deletions
diff --git a/am-wrapper.sh b/am-wrapper.sh
index b21e0e0..e3d84a8 100755
--- a/am-wrapper.sh
+++ b/am-wrapper.sh
@@ -1,14 +1,20 @@
#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-1.sh,v 1.4 2005/05/14 17:42:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-2.sh,v 1.1 2006/10/16 01:38:59 vapier Exp $
# Based on the am-wrapper.pl script provided by MandrakeSoft
# Rewritten in bash by Gregorio Guidi
#
# Executes the correct automake version.
#
-# - defaults to automake-1.9
+# - defaults to automake-1.10
+# - runs automake-1.9 if:
+# - envvar WANT_AUTOMAKE is set to `1.9'
+# -or-
+# - `Makefile.in' was generated by automake-1.9
+# -or-
+# - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.9
# - runs automake-1.8 if:
# - envvar WANT_AUTOMAKE is set to `1.8'
# -or-
@@ -45,12 +51,12 @@ if [ "${0##*/}" = "am-wrapper.sh" ] ; then
exit 1
fi
-vers="1.9 1.8 1.7 1.6 1.5 1.4"
+vers="1.10 1.9 1.8 1.7 1.6 1.5 1.4"
for v in ${vers} ; do
eval binary_${v/./_}="${0}-${v}"
done
-binary="${binary_1_9}"
+binary="${binary_1_10}"
#
# Check the WANT_AUTOMAKE setting
@@ -79,11 +85,11 @@ do_awk() {
#
if [ -z "${WANT_AUTOMAKE}" ] ; then
if [ -r "Makefile.in" ] ; then
- confversion_mf=$(do_awk Makefile.in 2 "^# Makefile.in generated (automatically )?by automake ([0-9].[0-9])")
+ confversion_mf=$(do_awk Makefile.in 2 "^# Makefile.in generated (automatically )?by automake ([0-9].[0-9]+)")
fi
if [ -r "aclocal.m4" ] ; then
- confversion_ac=$(do_awk aclocal.m4 1 'generated automatically by aclocal ([0-9].[0-9])')
- confversion_am=$(do_awk aclocal.m4 1 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?([0-9].[0-9])[^)]*\\]?\\)')
+ confversion_ac=$(do_awk aclocal.m4 1 'generated automatically by aclocal ([0-9].[0-9]+)')
+ confversion_am=$(do_awk aclocal.m4 1 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?([0-9].[0-9]+)[^)]*\\]?\\)')
fi
for v in ${vers} ; do