diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-03-09 16:46:20 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-03-09 16:46:20 +0000 |
| commit | aaecf8778f1b6e434aa5658e261970722f758fe5 (patch) | |
| tree | 2372b896f272fd899649564a152fe975400caf13 | |
| parent | update am-wrapper.pl to work with AC_PREREQ in [] (diff) | |
| download | historical-aaecf8778f1b6e434aa5658e261970722f758fe5.tar.gz historical-aaecf8778f1b6e434aa5658e261970722f758fe5.tar.bz2 historical-aaecf8778f1b6e434aa5658e261970722f758fe5.zip | |
update ac-wrapper.pl to work with AC_PREREQ in []
| -rw-r--r-- | sys-devel/autoconf/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/autoconf/autoconf-2.57.ebuild | 4 | ||||
| -rw-r--r-- | sys-devel/autoconf/files/ac-wrapper.pl | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog index 3f04c72760f9..340f7446b678 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.21 2003/02/24 20:35:36 dragon Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.22 2003/03/09 16:46:20 azarah Exp $ + + 09 Mar 2003; Martin Schlemmer <azarah@gentoo.org> files/ac-wrapper.pl : + Some new stuff have AC_PREREQ in []. 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. diff --git a/sys-devel/autoconf/autoconf-2.57.ebuild b/sys-devel/autoconf/autoconf-2.57.ebuild index 51b05b53f817..600a176bbb6c 100644 --- a/sys-devel/autoconf/autoconf-2.57.ebuild +++ b/sys-devel/autoconf/autoconf-2.57.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57.ebuild,v 1.5 2003/02/24 20:35:36 dragon Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.57.ebuild,v 1.6 2003/03/09 16:46:20 azarah Exp $ IUSE="" @@ -104,7 +104,7 @@ src_install() { # # need to use 'prefix' here, else we get sandbox problems - cd ${OLD_S} + cd ${OLD_S} make prefix=${D}/usr \ mandir=${D}/usr/share/man \ infodir=${D}/usr/share/info \ diff --git a/sys-devel/autoconf/files/ac-wrapper.pl b/sys-devel/autoconf/files/ac-wrapper.pl index 50858025b7e9..86797efbb912 100644 --- a/sys-devel/autoconf/files/ac-wrapper.pl +++ b/sys-devel/autoconf/files/ac-wrapper.pl @@ -43,10 +43,10 @@ if (!$ENV{WANT_AUTOCONF_2_1}) { || (-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.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})[^\)]*\]?\)/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 { |