diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2004-02-15 21:15:46 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2004-02-15 21:15:46 +0000 |
| commit | f88d77bef1b7b1e281e3900302ee94f0183ef0e2 (patch) | |
| tree | c45f2eebfe694038afaeff2782a9ac3ee464683b /sys-devel/autoconf | |
| parent | Initial Import. (Manifest recommit) (diff) | |
| download | gentoo-2-f88d77bef1b7b1e281e3900302ee94f0183ef0e2.tar.gz gentoo-2-f88d77bef1b7b1e281e3900302ee94f0183ef0e2.tar.bz2 gentoo-2-f88d77bef1b7b1e281e3900302ee94f0183ef0e2.zip | |
Set AUTOM4TE to autoconf version being run, bug #40983.
Diffstat (limited to 'sys-devel/autoconf')
| -rw-r--r-- | sys-devel/autoconf/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/autoconf/files/ac-wrapper-2.pl | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog index bfc0871b531a..ad6d893b25cd 100644 --- a/sys-devel/autoconf/ChangeLog +++ b/sys-devel/autoconf/ChangeLog @@ -1,6 +1,9 @@ # 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.38 2004/02/15 09:07:07 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.39 2004/02/15 21:15:46 azarah Exp $ + + 15 Feb 2004; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper-2.pl: + Set AUTOM4TE to autoconf version being run, bug #40983. 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 diff --git a/sys-devel/autoconf/files/ac-wrapper-2.pl b/sys-devel/autoconf/files/ac-wrapper-2.pl index c720d9fefa10..5601bc74f732 100644 --- a/sys-devel/autoconf/files/ac-wrapper-2.pl +++ b/sys-devel/autoconf/files/ac-wrapper-2.pl @@ -65,6 +65,13 @@ 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; |