summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-09-23 18:28:25 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-09-23 18:28:25 +0000
commit35aa3855f5dc43829a3bdae49b7328520133e69b (patch)
treee65135cf5bac04c7afb6803e77836f02ba77f5ae /sys-devel/autoconf/files
parentChanged GPL to GPL-2 in LICENSE (diff)
downloadhistorical-35aa3855f5dc43829a3bdae49b7328520133e69b.tar.gz
historical-35aa3855f5dc43829a3bdae49b7328520133e69b.tar.bz2
historical-35aa3855f5dc43829a3bdae49b7328520133e69b.zip
wrapper updates
Diffstat (limited to 'sys-devel/autoconf/files')
-rw-r--r--sys-devel/autoconf/files/ac-wrapper.pl8
1 files changed, 8 insertions, 0 deletions
diff --git a/sys-devel/autoconf/files/ac-wrapper.pl b/sys-devel/autoconf/files/ac-wrapper.pl
index 9ab810604a21..29005d259501 100644
--- a/sys-devel/autoconf/files/ac-wrapper.pl
+++ b/sys-devel/autoconf/files/ac-wrapper.pl
@@ -23,6 +23,12 @@
# -or-
# - `configure.in' contains AC_PREREQ and the value's 3 first letters
# are stringwise greater than '2.1'
+# -or-
+# - `configure' is already present and was generated by autoconf greater than
+# '2.1'
+# -or-
+# - `Makefile.in' was generated by automake-1.6 or superior, which
+# specifically needs autoconf-2.5x
#
#use MDK::Common;
@@ -37,6 +43,8 @@ if (!$ENV{WANT_AUTOCONF_2_1}) {
&& ($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;