diff options
| author |   Brad House <brad_mssw@gentoo.org> | 2004-02-16 04:57:01 +0000 |
|---|---|---|
| committer | Brad House <brad_mssw@gentoo.org> | 2004-02-16 04:57:01 +0000 |
| commit | 053a707bd2ef20e25b3f3f1a2e6833f768edb7e2 (patch) | |
| tree | 403caf2133fe60c214a13b4694510bf5d0c02b39 /sys-devel/autoconf | |
| parent | Initial Import, wvu. (Manifest recommit) (diff) | |
| download | gentoo-2-053a707bd2ef20e25b3f3f1a2e6833f768edb7e2.tar.gz gentoo-2-053a707bd2ef20e25b3f3f1a2e6833f768edb7e2.tar.bz2 gentoo-2-053a707bd2ef20e25b3f3f1a2e6833f768edb7e2.zip | |
revert patches
Diffstat (limited to 'sys-devel/autoconf')
| -rw-r--r-- | sys-devel/autoconf/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/autoconf/files/ac-wrapper-2.pl | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog index 2a7bf3a8dad8..4ff939df069a 100644 --- a/sys-devel/autoconf/ChangeLog +++ b/sys-devel/autoconf/ChangeLog @@ -1,9 +1,13 @@ # 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.40 2004/02/15 21:18:56 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.41 2004/02/16 04:57:01 brad_mssw Exp $ *autoconf-2.59-r1 (15 Feb 2004) + 15 Feb 2004; Brad House <brad_mssw@gentoo.org> files/ac-wrapper-2.pl: + Revert ac-wrapper-2.pl patch, as it causes any package that runs autoheader to + fail + 15 Feb 2004; Martin Schlemmer <azarah@gentoo.org> autoconf-2.59-r1.ebuild: New revision to propagate recent wrapper fixes. diff --git a/sys-devel/autoconf/files/ac-wrapper-2.pl b/sys-devel/autoconf/files/ac-wrapper-2.pl index 5601bc74f732..561cea33a3e2 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}[0-9]?)[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) { + || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/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 { @@ -65,13 +65,6 @@ if ($ENV{WANT_AUTOCONF} ne '2.1') { } } -# Set AUTOM4TE to the proper version (bug #40983). -# Do not set it for 2.13 though, as it does not ship autom4te. -if(($ENV{AUTOM4TE} eq "") && ($binary ne "$0-2.13")) { - $ENV{AUTOM4TE} = $binary; - $ENV{AUTOM4TE} =~ s/autoconf/autom4te/; -} - $ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n"; exec $binary, @ARGV; |