diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2004-02-15 09:07:07 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2004-02-15 09:07:07 +0000 |
| commit | fbacf54a2c35eed21800b7cdae9b8ed58ad6d37a (patch) | |
| tree | 8cea833bb6851072357edfd9e0a9fefc609ff994 | |
| parent | Added to ~ppc (Manifest recommit) (diff) | |
| download | gentoo-2-fbacf54a2c35eed21800b7cdae9b8ed58ad6d37a.tar.gz gentoo-2-fbacf54a2c35eed21800b7cdae9b8ed58ad6d37a.tar.bz2 gentoo-2-fbacf54a2c35eed21800b7cdae9b8ed58ad6d37a.zip | |
Fix ac-wrapper.pl to also work with AC_PREREQ(2.50) (note the 2.50 and not 2.5).
| -rw-r--r-- | sys-devel/autoconf/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/autoconf/files/ac-wrapper-2.pl | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog index be3e6bf4b43e..bfc0871b531a 100644 --- a/sys-devel/autoconf/ChangeLog +++ b/sys-devel/autoconf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/autoconf # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.37 2004/01/30 22:32:06 tuxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.38 2004/02/15 09:07:07 azarah Exp $ + + 14 Feb 2004; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-2.pl: + Fix ac-wrapper.pl to also work with AC_PREREQ(2.50) (note the 2.50 and not + 2.5). 30 Jan 2004; <tuxus@gentoo.org> autoconf-2.58.ebuild: stable on mips. diff --git a/sys-devel/autoconf/files/ac-wrapper-2.pl b/sys-devel/autoconf/files/ac-wrapper-2.pl index 561cea33a3e2..c720d9fefa10 100644 --- a/sys-devel/autoconf/files/ac-wrapper-2.pl +++ b/sys-devel/autoconf/files/ac-wrapper-2.pl @@ -54,10 +54,10 @@ if ($ENV{WANT_AUTOCONF} ne '2.1') { || (-x $binary_new # user may have only 2.13 && (($ENV{WANT_AUTOCONF} eq '2.5') || -r 'configure.ac' - || (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_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6' - || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) { + || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) { $ENV{WANT_AUTOCONF} = '2.5'; # to prevent further "cats" and to enhance consistency (possible cwd etc) $binary = $binary_new; } else { |