diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-04-22 20:56:55 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-04-22 20:56:55 +0000 |
| commit | debf8fa287f8b03e9baa1cb8bb827197c6d48dbe (patch) | |
| tree | a01472ba6e7037291757648651320bfcee17fd30 /sys-devel/automake | |
| parent | fix ac-wrapper.pl (diff) | |
| download | gentoo-2-debf8fa287f8b03e9baa1cb8bb827197c6d48dbe.tar.gz gentoo-2-debf8fa287f8b03e9baa1cb8bb827197c6d48dbe.tar.bz2 gentoo-2-debf8fa287f8b03e9baa1cb8bb827197c6d48dbe.zip | |
fix am-wrapper.pl
Diffstat (limited to 'sys-devel/automake')
| -rw-r--r-- | sys-devel/automake/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/automake/files/am-wrapper.pl | 4 | ||||
| -rw-r--r-- | sys-devel/automake/files/am-wrapper.pl-1.5 | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog index 261dfff601e6..c15ef6550db7 100644 --- a/sys-devel/automake/ChangeLog +++ b/sys-devel/automake/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sys-devel/automake # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.4 2002/04/07 06:35:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.5 2002/04/22 20:56:55 azarah Exp $ + 22 April 2002; M.Schlemmer <azarah@gentoo.org> am-wrapper.pl : + + Update so that it can work with AC_PREREQ([2.13]) as well as AC_PREREQ(2.13). + automake-1.5d-r2 (21 March 2002) 7 April 2002; M.Schlemmer <azarah@gentoo.org> : diff --git a/sys-devel/automake/files/am-wrapper.pl b/sys-devel/automake/files/am-wrapper.pl index 70f2d9066749..3d71e75a9711 100644 --- a/sys-devel/automake/files/am-wrapper.pl +++ b/sys-devel/automake/files/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 { diff --git a/sys-devel/automake/files/am-wrapper.pl-1.5 b/sys-devel/automake/files/am-wrapper.pl-1.5 index c42858ee88c1..21a4d0d019c9 100644 --- a/sys-devel/automake/files/am-wrapper.pl-1.5 +++ b/sys-devel/automake/files/am-wrapper.pl-1.5 @@ -36,8 +36,8 @@ if (!$ENV{WANT_AUTOMAKE_1_4}) { if (-x $binary_new # user may have only 2.13 && ($ENV{WANT_AUTOMAKE_1_5} || -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_5} = 1; # to prevent further "cats" and to enhance consistency (possible cwd etc) $binary = $binary_new; } else { |