aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-04-22 20:56:55 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-04-22 20:56:55 +0000
commit1daab89f32e76dc04e5b4f0a7cfe307a21a61b89 (patch)
treec8bd16f88f8edca5633d98bc9fa606ddba28fdda
parentnew dual version (diff)
downloadautotools-wrappers-1daab89f32e76dc04e5b4f0a7cfe307a21a61b89.tar.gz
autotools-wrappers-1daab89f32e76dc04e5b4f0a7cfe307a21a61b89.tar.bz2
autotools-wrappers-1daab89f32e76dc04e5b4f0a7cfe307a21a61b89.zip
fix am-wrapper.pl
Update so that it can work with AC_PREREQ([2.13]) as well as AC_PREREQ(2.13).
-rwxr-xr-xam-wrapper.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/am-wrapper.pl b/am-wrapper.pl
index 70f2d90..3d71e75 100755
--- a/am-wrapper.pl
+++ b/am-wrapper.pl
@@ -36,8 +36,8 @@ if (!$ENV{WANT_AUTOMAKE_1_4}) {
if (-x $binary_new # user may have only 2.13
&& ($ENV{WANT_AUTOMAKE_1_6}
|| -r 'configure.ac'
- || (cat_('configure.in') =~ /^\s*AC_PREREQ\(([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1'
- || (cat_('aclocal.m4') =~ /^\s*AC_PREREQ\(([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1')) {
+ || (cat_('configure.in') =~ /^\s*AC_PREREQ\(\[?([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1'
+ || (cat_('aclocal.m4') =~ /^\s*AC_PREREQ\(\[?([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1')) {
$ENV{WANT_AUTOMAKE_1_6} = 1; # to prevent further "cats" and to enhance consistency (possible cwd etc)
$binary = $binary_new;
} else {