diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-03-09 16:46:15 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-03-09 16:46:15 +0000 |
| commit | 92cbfca396ece8f73797e42d3ac14693107837c5 (patch) | |
| tree | fc7437c01f1c3efcb89ff5ae2a0e87efc638dbc3 | |
| parent | getting ready to put in galeon-1.3.2 as masked (diff) | |
| download | gentoo-2-92cbfca396ece8f73797e42d3ac14693107837c5.tar.gz gentoo-2-92cbfca396ece8f73797e42d3ac14693107837c5.tar.bz2 gentoo-2-92cbfca396ece8f73797e42d3ac14693107837c5.zip | |
update am-wrapper.pl to work with AC_PREREQ in []
| -rw-r--r-- | sys-devel/automake/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/automake/files/am-wrapper.pl-1.7 | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog index 4b09d27fa99d..c128fcbd32ba 100644 --- a/sys-devel/automake/ChangeLog +++ b/sys-devel/automake/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/automake # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.24 2003/02/19 21:46:47 zwelch Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.25 2003/03/09 16:46:15 azarah Exp $ + + 09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> files/am-wrapper.pl-1.7 : + Some new stuff have AC_PREREQ in []. 18 Feb 2003; Zach Welch <zwelch@gentoo.org> : Added arm to keywords. diff --git a/sys-devel/automake/files/am-wrapper.pl-1.7 b/sys-devel/automake/files/am-wrapper.pl-1.7 index 0bd13a36616d..83e926ec08d8 100644 --- a/sys-devel/automake/files/am-wrapper.pl-1.7 +++ b/sys-devel/automake/files/am-wrapper.pl-1.7 @@ -92,9 +92,9 @@ if ($ENV{WANT_AUTOMAKE} ne '1.4') { || (cat_('aclocal.m4') =~ /^\s*\[?AM_AUTOMAKE_VERSION\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') ge '1.6' # Autoconf 2.53d and later need automake-1.6c, so enable 1.6 for 2.53 # and up ..... - || (cat_('configure.in') =~ /^\s*AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52' + || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52' || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.52' - || (cat_('aclocal.m4') =~ /^\s*AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52')) { + || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{4})[^\)]*\]?\)/m ? $1 : '') gt '2.52')) { $ENV{WANT_AUTOMAKE} = '1.6'; # to prevent further "cats" and to enhance consistency (possible cwd etc) $binary = $binary_1_6; } elsif (-x $binary_1_5 # user may have only 1.4 ... @@ -102,9 +102,9 @@ if ($ENV{WANT_AUTOMAKE} ne '1.4') { || -r 'configure.ac' || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.5' || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.5' - || (cat_('configure.in') =~ /^\s*AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' + || (cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1' || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1' - || (cat_('aclocal.m4') =~ /^\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'; # to prevent further "cats" and to enhance consistency (possible cwd etc) $binary = $binary_1_5; } else { |