diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-02-20 00:12:27 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-02-20 00:12:27 +0000 |
| commit | 7e6438f9517f19ea145dd14bb6b4696aff497a61 (patch) | |
| tree | e78c7d4d7f855eba8b18f539fc59b3e8049a8b43 /sys-devel/autoconf | |
| parent | new version (diff) | |
| download | gentoo-2-7e6438f9517f19ea145dd14bb6b4696aff497a61.tar.gz gentoo-2-7e6438f9517f19ea145dd14bb6b4696aff497a61.tar.bz2 gentoo-2-7e6438f9517f19ea145dd14bb6b4696aff497a61.zip | |
autom4te tweak
Diffstat (limited to 'sys-devel/autoconf')
| -rw-r--r-- | sys-devel/autoconf/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/autoconf/files/ac-wrapper.pl | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog index b6728d23c2f8..0dcd12e07e7a 100644 --- a/sys-devel/autoconf/ChangeLog +++ b/sys-devel/autoconf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/autoconf # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.19 2003/02/19 21:46:47 zwelch Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.20 2003/02/20 00:12:27 azarah Exp $ + + 20 Feb 2003; Martin Schlemmer <azarah@gentoo.org> autoconf-2.57.ebuild : + Run autom4te-2.5x if called without setting WANT_AUTOMAKE_2_5=1 ... 18 Feb 2003; Zach Welch <zwelch@gentoo.org> : Added arm to keywords diff --git a/sys-devel/autoconf/files/ac-wrapper.pl b/sys-devel/autoconf/files/ac-wrapper.pl index 7b9bcb71bb0f..50858025b7e9 100644 --- a/sys-devel/autoconf/files/ac-wrapper.pl +++ b/sys-devel/autoconf/files/ac-wrapper.pl @@ -39,13 +39,14 @@ my $binary = "$0-2.13"; my $binary_new = "$0-2.5x"; if (!$ENV{WANT_AUTOCONF_2_1}) { - if (-x $binary_new # user may have only 2.13 - && ($ENV{WANT_AUTOCONF_2_5} - || -r 'configure.ac' - || (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')) { + if ((! -x $binary) # handle stuff like autom4te, where only 2.5x have the binary + || (-x $binary_new # user may have only 2.13 + && ($ENV{WANT_AUTOCONF_2_5} + || -r 'configure.ac' + || (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'))) { $ENV{WANT_AUTOCONF_2_5} = 1; # to prevent further "cats" and to enhance consistency (possible cwd etc) $binary = $binary_new; } else { |