From e6b78305e0592151f0b73606a86dbbd1e1e1bcd4 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Thu, 21 Mar 2002 07:50:11 +0000
Subject: new version

Add dual ebuild which contain 2.13 and 2.53, and autodetect the
correct version to use.
---
 ac-wrapper.pl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100755 ac-wrapper.pl

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
new file mode 100755
index 0000000..b0235ce
--- /dev/null
+++ b/ac-wrapper.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+#
+#
+# Guillaume Cottenceau (gc@mandrakesoft.com)
+#
+# Copyright 2001 MandrakeSoft
+#
+# This software may be freely redistributed under the terms of the GNU
+# public license.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#
+# Executes the correct autoconf version.
+#
+# - defaults to autoconf-2.13
+# - runs autoconf-2.5x if it exists and...
+#   - envvar WANT_AUTOCONF_2_5 is set to `1'
+#     -or-
+#   - configure.ac is present
+#     -or-
+#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
+#     are stringwise greater than '2.1'
+#
+
+#use MDK::Common;
+
+sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
+
+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_('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 {
+	$ENV{WANT_AUTOCONF_2_1} = 1;    # for further consistency
+    }
+}
+
+$ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
+
+exec $binary, @ARGV;
+
+die "ac-wrapper: ouch, couldn't call binary ($binary).\n";
-- 
cgit v1.2.3-65-gdbad


From 75a9c4e37083e03b72c9f02f1b2e6a958ff4520e Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Mon, 22 Apr 2002 20:51:46 +0000
Subject: fix ac-wrapper.pl

Update so that it can work with AC_PREREQ([2.13]) as well as AC_PREREQ(2.13).
---
 ac-wrapper.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index b0235ce..2f20ed7 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -16,7 +16,7 @@
 # Executes the correct autoconf version.
 #
 # - defaults to autoconf-2.13
-# - runs autoconf-2.5x if it exists and...
+# - runs autoconf-2.52d if it exists and...
 #   - envvar WANT_AUTOCONF_2_5 is set to `1'
 #     -or-
 #   - configure.ac is present
@@ -30,14 +30,14 @@
 sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
 
 my $binary     = "$0-2.13";
-my $binary_new = "$0-2.5x";
+my $binary_new = "$0-2.52d";
 
 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_('aclocal.m4') =~ /^\s*AC_PREREQ\(([^\)]{3})[^\)]*\)/m ? $1 : '') gt '2.1')) {
+	    || (cat_('configure.in') =~ /^\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 {
-- 
cgit v1.2.3-65-gdbad


From 2f5a0a55d1296e76335dfbf5bfc3acff3268c253 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Mon, 22 Apr 2002 21:00:38 +0000
Subject: fix comment

---
 ac-wrapper.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 2f20ed7..9ab8106 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -16,7 +16,7 @@
 # Executes the correct autoconf version.
 #
 # - defaults to autoconf-2.13
-# - runs autoconf-2.52d if it exists and...
+# - runs autoconf-2.5x if it exists and...
 #   - envvar WANT_AUTOCONF_2_5 is set to `1'
 #     -or-
 #   - configure.ac is present
@@ -30,7 +30,7 @@
 sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
 
 my $binary     = "$0-2.13";
-my $binary_new = "$0-2.52d";
+my $binary_new = "$0-2.5x";
 
 if (!$ENV{WANT_AUTOCONF_2_1}) {
     if (-x $binary_new                  # user may have only 2.13
-- 
cgit v1.2.3-65-gdbad


From a1fc52e19eac74031c8ad5788be050b77d298ed6 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Mon, 23 Sep 2002 18:28:25 +0000
Subject: wrapper updates

Firstly I should mention that the perl wrapper 'ac-wrapper.pl', is
based on great work by Guillaume Cottenceau (gc@mandrakesoft.com).
This updates it to correctly detect if automake-1.6 was used.
---
 ac-wrapper.pl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 9ab8106..29005d2 100755
--- a/ac-wrapper.pl
+++ b/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;
-- 
cgit v1.2.3-65-gdbad


From 50770415a10bdbcaf58f1c534d2bc5693992fd35 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Tue, 21 Jan 2003 17:26:07 +0000
Subject: new version

---
 ac-wrapper.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 29005d2..7b9bcb7 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -42,10 +42,10 @@ 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.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 {
-- 
cgit v1.2.3-65-gdbad


From 10c036ae4c1f6e5c5575d364ef5977d84f33ac98 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Thu, 20 Feb 2003 00:12:27 +0000
Subject: autom4te tweak

Run autom4te-2.5x if called without setting WANT_AUTOMAKE_2_5=1 ...
---
 ac-wrapper.pl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 7b9bcb7..5085802 100755
--- a/ac-wrapper.pl
+++ b/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 {
-- 
cgit v1.2.3-65-gdbad


From 40adc550c73fe1c997f993c911b4fa3123943938 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sun, 9 Mar 2003 16:46:20 +0000
Subject: update ac-wrapper.pl to work with AC_PREREQ in []

Some new stuff have AC_PREREQ in [].
---
 ac-wrapper.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 5085802..86797ef 100755
--- a/ac-wrapper.pl
+++ b/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 {
-- 
cgit v1.2.3-65-gdbad


From 14019c2fb105c1d377200b139ede9ab6729e9c9b Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Fri, 7 Nov 2003 23:47:32 +0000
Subject: Update version closing bug #32830. Change to automake's style of
 selecting version, closing bug #31016.

---
 ac-wrapper.pl | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 86797ef..561cea3 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -17,7 +17,7 @@
 #
 # - defaults to autoconf-2.13
 # - runs autoconf-2.5x if it exists and...
-#   - envvar WANT_AUTOCONF_2_5 is set to `1'
+#   - envvar WANT_AUTOCONF is set to `2.5'
 #     -or-
 #   - configure.ac is present
 #     -or-
@@ -38,19 +38,30 @@ sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join
 my $binary     = "$0-2.13";
 my $binary_new = "$0-2.5x";
 
-if (!$ENV{WANT_AUTOCONF_2_1}) {
-    if ((! -x $binary)              # handle stuff like autom4te, where only 2.5x have the binary
+# Autoconf is really getting out of hand, so rather start supporting
+# WANT_AUTOCONF = "2.5" the like.  Unfortunately it override the old
+# variables, so if not set, just convert the old variables ....
+if ($ENV{WANT_AUTOCONF} eq "") {
+	if ($ENV{WANT_AUTOCONF_2_1}) {
+		$ENV{WANT_AUTOCONF} = '2.1';
+	} elsif ($ENV{WANT_AUTOCONF_2_5}) {
+		$ENV{WANT_AUTOCONF} = '2.5';
+	}
+}
+
+if ($ENV{WANT_AUTOCONF} ne '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}
+	    && (($ENV{WANT_AUTOCONF} eq '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;
+	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary 	    = $binary_new;
     } else {
-	$ENV{WANT_AUTOCONF_2_1} = 1;    # for further consistency
+	$ENV{WANT_AUTOCONF} = '2.1';    # for further consistency
     }
 }
 
-- 
cgit v1.2.3-65-gdbad


From ff304ece7c6c09347935e131efdc55048fb5630b Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sun, 15 Feb 2004 09:07:07 +0000
Subject: Fix ac-wrapper.pl to also work with AC_PREREQ(2.50) (note the 2.50
 and not 2.5).

---
 ac-wrapper.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 561cea3..c720d9f 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.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})[^\)]*\]?\)/m ? $1 : '') gt '2.1'))) {
+	        || (cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/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 {
-- 
cgit v1.2.3-65-gdbad


From 59295d5d68160ef5e8f2a88966365ab72e633104 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sun, 15 Feb 2004 21:15:46 +0000
Subject: Set AUTOM4TE to autoconf version being run, bug #40983.

---
 ac-wrapper.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index c720d9f..5601bc7 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.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;
-- 
cgit v1.2.3-65-gdbad


From 46de1175a0703975e1ccd0d27eaddd108824a076 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Mon, 16 Feb 2004 17:48:12 +0000
Subject: Add ac-wrapper.pl with fixed fix for bug #40983.

---
 ac-wrapper.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 5601bc7..45efc78 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -67,9 +67,10 @@ 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/;
+if(($ENV{AUTOM4TE} eq "")
+   && ($ENV{WANT_AUTOCONF} = '2.5')
+   && ($0 ne 'autom4te')) {
+	$ENV{AUTOM4TE} = "autom4te-2.5x";
 }
 
 $ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
-- 
cgit v1.2.3-65-gdbad


From 00802303514d5e8b88c7e73b59d023289059d876 Mon Sep 17 00:00:00 2001
From: Caleb Tennis <caleb@gentoo.org>
Date: Thu, 27 May 2004 13:39:40 +0000
Subject: New version which incorporates a new ac-wrapper for a few bug fixes
 (#47772 and #41389)

Use a subroutine which will pull out the greatest AC_PREREQ() value in
a configure.in file in case there is more than one (see Bug #41389).
Also, change the gt statements to be 2.13 instead of 2.1 or AC_PREREQs fail
on seeing 2.12 for example (actually, don't fail, but use autoconf-2.5x which
is not correct).
---
 ac-wrapper.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index 45efc78..e03c0fd 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -34,6 +34,9 @@
 #use MDK::Common;
 
 sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
+sub ac_version {
+	return ((@versions = cat_(shift) =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : '');
+}
 
 my $binary     = "$0-2.13";
 my $binary_new = "$0-2.5x";
@@ -54,10 +57,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') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.1'
+		|| ac_version('configure.in') gt '2.13'
+	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.13'
 	        || (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'))) {
+		|| ac_version('aclocal.m4') gt '2.13'))) {
 	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
 	$binary 	    = $binary_new;
     } else {
-- 
cgit v1.2.3-65-gdbad


From 9e8fdbbd4416d17e0c6608843e03235612be577d Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Wed, 16 Jun 2004 15:54:44 +0000
Subject: Update comments to show that we check for 2.13 and not 2.1.

---
 ac-wrapper.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index e03c0fd..984ce67 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -22,10 +22,10 @@
 #   - configure.ac is present
 #     -or-
 #   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#     are stringwise greater than '2.1'
+#     are stringwise greater than '2.13'
 #     -or-
 #   - `configure' is already present and was generated by autoconf greater than
-#     '2.1'
+#     '2.13'
 #     -or-
 #   - `Makefile.in' was generated by automake-1.6 or superior, which
 #     specifically needs autoconf-2.5x
-- 
cgit v1.2.3-65-gdbad


From 9db628b01ac216f4091eba045dc6f5bc10eb14bc Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 21 Oct 2004 01:06:11 +0000
Subject: initial import

Break the autoconf wrapper (ac-wrapper.pl) off into its own package.
This updated version resolves #56670 and #66478.
---
 ac-wrapper.pl | 141 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 92 insertions(+), 49 deletions(-)
 mode change 100755 => 100644 ac-wrapper.pl

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
old mode 100755
new mode 100644
index 984ce67..f041cdb
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -2,8 +2,9 @@
 #
 #
 # Guillaume Cottenceau (gc@mandrakesoft.com)
+# Abel Cheung (deaddog@deaddog.org)
 #
-# Copyright 2001 MandrakeSoft
+# Copyright 2001-2002, 2004 MandrakeSoft
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license.
@@ -12,72 +13,114 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
+#######################################################################
 #
 # Executes the correct autoconf version.
 #
-# - defaults to autoconf-2.13
-# - runs autoconf-2.5x if it exists and...
-#   - envvar WANT_AUTOCONF is set to `2.5'
+# - defaults to autoconf-2.59
+# - runs autoconf-2.13 only if:
+#   - envvar WANT_AUTOCONF_2_1 is set to `1'
 #     -or-
-#   - configure.ac is present
-#     -or-
-#   - `configure.in' contains AC_PREREQ and the value's 3 first letters
-#     are stringwise greater than '2.13'
-#     -or-
-#   - `configure' is already present and was generated by autoconf greater than
-#     '2.13'
-#     -or-
-#   - `Makefile.in' was generated by automake-1.6 or superior, which
-#     specifically needs autoconf-2.5x
+#   - `configure' is already present and was generated by autoconf 2.13
+#
+#######################################################################
+#
+# ChangeLog:
+# 
+# * Fri May 14 2004
+# - Use autoconf 2.59 by default, unless `configure' is generated by
+#   autoconf 2.13, or WANT_AUTOCONF_2_1 is set.
+# - WANT_AUTOCONF_2_5 has no effect now
+#
+# * Thu May 27 2004
+# - Almost rewrite
+# - Introduce FORCE_AUTOCONF_2_5 (avoid misuse with WANT_*), which can be used
+#   when you want to play with fire :-)
+# - More verbose and user oriented messages (gc et. al.)
 #
+# * Sat Jul 03 2004
+# - require autoconf2.1 and remove special error message
+# - allow use of tools without configure.in or configure.ac (2.5 only)
+#   required for autodetection by apps
 
-#use MDK::Common;
+use File::Basename qw(basename);
+use strict;
 
 sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
-sub ac_version {
-	return ((@versions = cat_(shift) =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3}[0-9]?)[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : '');
+
+sub errmsg {
+	my $dummy = 0;
+	my @msg = @_;
+	foreach (@msg) {
+		print STDERR (($dummy++ == 0)? "ac-wrapper: " : "            ") . $_ . "\n";
+	}
+	exit 1;
 }
 
-my $binary     = "$0-2.13";
-my $binary_new = "$0-2.5x";
+errmsg ("Don't call this script directly.") if (basename("$0") eq "ac-wrapper.pl");
 
-# Autoconf is really getting out of hand, so rather start supporting
-# WANT_AUTOCONF = "2.5" the like.  Unfortunately it override the old
-# variables, so if not set, just convert the old variables ....
-if ($ENV{WANT_AUTOCONF} eq "") {
+#
+# go away naughty guys/gals
+#
+if (($ENV{WANT_AUTOCONF_2_1}) && ($ENV{FORCE_AUTOCONF_2_5})) {
+	errmsg ("You can only set either WANT_AUTOCONF_2_1 or FORCE_AUTOCONF_2_5,",
+		"but not both.");
+}
+
+if (($ENV{WANT_AUTOCONF_2_1}) && (basename("$0") eq "autom4te")) {
+	errmsg ("Autoconf 2.13 doesn't contain autom4te.",
+		"Either unset WANT_AUTOCONF_2_1 or don't execute anything",
+		"that would use autom4te.");
+}
+
+my $binary_new = "$0-2.59";
+my $binary_old = "$0-2.13";
+my $binary = $binary_new;
+my $confversion = 'Undetected';
+
+if ((-f "configure.ac") || (-f "configure.in")) {
+#
+# autodetect routine
+#
 	if ($ENV{WANT_AUTOCONF_2_1}) {
-		$ENV{WANT_AUTOCONF} = '2.1';
-	} elsif ($ENV{WANT_AUTOCONF_2_5}) {
-		$ENV{WANT_AUTOCONF} = '2.5';
+		if ((-f "configure.in") && (! -f "configure.ac")) {
+			$binary = $binary_old;
+		} else {
+			errmsg ("Since configure.ac is present, aclocal always use",
+				"autoconf 2.59, which conflicts with your choice and",
+				"causes error. You have two options:",
+				"1. Try execute command again after removing configure.ac",
+				"2. Don't set WANT_AUTOCONF_2_1 variable");
+		}
+	} elsif (!($ENV{FORCE_AUTOCONF_2_5})) {
+		# U > [0-9] in lexicon comparison
+		$confversion = (cat_('configure') =~ /^# Generated (by (?:GNU )?Autoconf|automatically using autoconf version) (\S+)/m ? $2 : 'Unknown');
+	
+		if (("$confversion" lt '2.5') && (! -f "configure.ac")) {
+			$binary = $binary_old;
+		}
 	}
 }
 
-if ($ENV{WANT_AUTOCONF} ne '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} eq '2.5')
-	        || -r 'configure.ac'
-		|| ac_version('configure.in') gt '2.13'
-	        || (cat_('configure') =~ /^# Generated by Autoconf (\S+)/m ? $1 : '') gt '2.13'
-	        || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.6'
-		|| ac_version('aclocal.m4') gt '2.13'))) {
-	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
-	$binary 	    = $binary_new;
-    } else {
-	$ENV{WANT_AUTOCONF} = '2.1';    # for further consistency
-    }
+if ($ENV{WANT_ACWRAPPER_DEBUG}) {
+	print STDERR "ac-wrapper: DEBUG: Detected version is '$confversion'\n";
+	print STDERR "ac-wrapper: DEBUG: WANT_AUTOCONF_2_1 is set\n" if ($ENV{WANT_AUTOCONF_2_1});
+	print STDERR "ac-wrapper: DEBUG: FORCE_AUTOCONF_2_5 is set\n" if ($ENV{FORCE_AUTOCONF_2_5});
+	print STDERR "ac-wrapper: DEBUG: will execute <$binary>\n";
 }
 
-# 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 "")
-   && ($ENV{WANT_AUTOCONF} = '2.5')
-   && ($0 ne 'autom4te')) {
-	$ENV{AUTOM4TE} = "autom4te-2.5x";
-}
+#
+# for further consistency
+#
+$ENV{WANT_AUTOCONF_2_1} = 1 if ("$binary" eq "$binary_old");
+$ENV{FORCE_AUTOCONF_2_5} = 1 if ("$binary" eq "$binary_new");
 
-$ENV{WANT_ACWRAPPER_DEBUG} and print STDERR "ac-wrapper: will execute <$binary>\n";
+if (! -x "$binary") {
+	# this shouldn't happen
+	errmsg ("$binary is missing or not executable.",
+		"Something is very wrong.");
+}
 
 exec $binary, @ARGV;
 
-die "ac-wrapper: ouch, couldn't call binary ($binary).\n";
+errmsg ("was unable to exec $binary !?");
-- 
cgit v1.2.3-65-gdbad


From 1d73dbd6f38949ad4f58946b71ce7d3e13c6de1d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 21 Oct 2004 13:42:24 +0000
Subject: use an error message that is a little more gentoo specific

---
 ac-wrapper.pl | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 ac-wrapper.pl

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
old mode 100644
new mode 100755
-- 
cgit v1.2.3-65-gdbad


From 4c1468f88f26ce4860d9a9e2d09a05f2f1f95b5c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 21 Oct 2004 13:42:24 +0000
Subject: use an error message that is a little more gentoo specific

---
 ac-wrapper.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
index f041cdb..06f53ec 100755
--- a/ac-wrapper.pl
+++ b/ac-wrapper.pl
@@ -118,7 +118,7 @@ $ENV{FORCE_AUTOCONF_2_5} = 1 if ("$binary" eq "$binary_new");
 if (! -x "$binary") {
 	# this shouldn't happen
 	errmsg ("$binary is missing or not executable.",
-		"Something is very wrong.");
+		"Please try emerging the correct version of autoconf.");
 }
 
 exec $binary, @ARGV;
-- 
cgit v1.2.3-65-gdbad


From 937a0b924137196c48f4cba60a0a94de4fa5622c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 14 Nov 2004 03:40:51 +0000
Subject: Punt the perl version and use the bash version by Gregorio Guidi
 #66478.

---
 ac-wrapper.pl | 126 ----------------------------------------------------------
 ac-wrapper.sh |  93 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 126 deletions(-)
 delete mode 100755 ac-wrapper.pl
 create mode 100755 ac-wrapper.sh

diff --git a/ac-wrapper.pl b/ac-wrapper.pl
deleted file mode 100755
index 06f53ec..0000000
--- a/ac-wrapper.pl
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/perl
-#
-#
-# Guillaume Cottenceau (gc@mandrakesoft.com)
-# Abel Cheung (deaddog@deaddog.org)
-#
-# Copyright 2001-2002, 2004 MandrakeSoft
-#
-# This software may be freely redistributed under the terms of the GNU
-# public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#######################################################################
-#
-# Executes the correct autoconf version.
-#
-# - defaults to autoconf-2.59
-# - runs autoconf-2.13 only if:
-#   - envvar WANT_AUTOCONF_2_1 is set to `1'
-#     -or-
-#   - `configure' is already present and was generated by autoconf 2.13
-#
-#######################################################################
-#
-# ChangeLog:
-# 
-# * Fri May 14 2004
-# - Use autoconf 2.59 by default, unless `configure' is generated by
-#   autoconf 2.13, or WANT_AUTOCONF_2_1 is set.
-# - WANT_AUTOCONF_2_5 has no effect now
-#
-# * Thu May 27 2004
-# - Almost rewrite
-# - Introduce FORCE_AUTOCONF_2_5 (avoid misuse with WANT_*), which can be used
-#   when you want to play with fire :-)
-# - More verbose and user oriented messages (gc et. al.)
-#
-# * Sat Jul 03 2004
-# - require autoconf2.1 and remove special error message
-# - allow use of tools without configure.in or configure.ac (2.5 only)
-#   required for autodetection by apps
-
-use File::Basename qw(basename);
-use strict;
-
-sub cat_ { local *F; open F, $_[0] or return; my @l = <F>; wantarray ? @l : join '', @l }
-
-sub errmsg {
-	my $dummy = 0;
-	my @msg = @_;
-	foreach (@msg) {
-		print STDERR (($dummy++ == 0)? "ac-wrapper: " : "            ") . $_ . "\n";
-	}
-	exit 1;
-}
-
-errmsg ("Don't call this script directly.") if (basename("$0") eq "ac-wrapper.pl");
-
-#
-# go away naughty guys/gals
-#
-if (($ENV{WANT_AUTOCONF_2_1}) && ($ENV{FORCE_AUTOCONF_2_5})) {
-	errmsg ("You can only set either WANT_AUTOCONF_2_1 or FORCE_AUTOCONF_2_5,",
-		"but not both.");
-}
-
-if (($ENV{WANT_AUTOCONF_2_1}) && (basename("$0") eq "autom4te")) {
-	errmsg ("Autoconf 2.13 doesn't contain autom4te.",
-		"Either unset WANT_AUTOCONF_2_1 or don't execute anything",
-		"that would use autom4te.");
-}
-
-my $binary_new = "$0-2.59";
-my $binary_old = "$0-2.13";
-my $binary = $binary_new;
-my $confversion = 'Undetected';
-
-if ((-f "configure.ac") || (-f "configure.in")) {
-#
-# autodetect routine
-#
-	if ($ENV{WANT_AUTOCONF_2_1}) {
-		if ((-f "configure.in") && (! -f "configure.ac")) {
-			$binary = $binary_old;
-		} else {
-			errmsg ("Since configure.ac is present, aclocal always use",
-				"autoconf 2.59, which conflicts with your choice and",
-				"causes error. You have two options:",
-				"1. Try execute command again after removing configure.ac",
-				"2. Don't set WANT_AUTOCONF_2_1 variable");
-		}
-	} elsif (!($ENV{FORCE_AUTOCONF_2_5})) {
-		# U > [0-9] in lexicon comparison
-		$confversion = (cat_('configure') =~ /^# Generated (by (?:GNU )?Autoconf|automatically using autoconf version) (\S+)/m ? $2 : 'Unknown');
-	
-		if (("$confversion" lt '2.5') && (! -f "configure.ac")) {
-			$binary = $binary_old;
-		}
-	}
-}
-
-if ($ENV{WANT_ACWRAPPER_DEBUG}) {
-	print STDERR "ac-wrapper: DEBUG: Detected version is '$confversion'\n";
-	print STDERR "ac-wrapper: DEBUG: WANT_AUTOCONF_2_1 is set\n" if ($ENV{WANT_AUTOCONF_2_1});
-	print STDERR "ac-wrapper: DEBUG: FORCE_AUTOCONF_2_5 is set\n" if ($ENV{FORCE_AUTOCONF_2_5});
-	print STDERR "ac-wrapper: DEBUG: will execute <$binary>\n";
-}
-
-#
-# for further consistency
-#
-$ENV{WANT_AUTOCONF_2_1} = 1 if ("$binary" eq "$binary_old");
-$ENV{FORCE_AUTOCONF_2_5} = 1 if ("$binary" eq "$binary_new");
-
-if (! -x "$binary") {
-	# this shouldn't happen
-	errmsg ("$binary is missing or not executable.",
-		"Please try emerging the correct version of autoconf.");
-}
-
-exec $binary, @ARGV;
-
-errmsg ("was unable to exec $binary !?");
diff --git a/ac-wrapper.sh b/ac-wrapper.sh
new file mode 100755
index 0000000..1f1810d
--- /dev/null
+++ b/ac-wrapper.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-1.sh,v 1.1 2004/11/14 03:40:51 vapier Exp $
+
+# Based on the ac-wrapper.pl script provided by MandrakeSoft
+# Rewritten in bash by Gregorio Guidi
+#
+# Executes the correct autoconf version.
+#
+# - defaults to latest version (2.5x)
+# - runs autoconf 2.13 only if:
+#   - envvar WANT_AUTOCONF is set to `2.1'
+#     -or-
+#   - `configure' is already present and was generated by autoconf 2.13
+
+if [ "${0##*/}" = "ac-wrapper.sh" ] ; then
+	echo "Don't call this script directly" >&2
+	exit 1
+fi
+
+if [ "${WANT_AUTOCONF}" = "2.1" -a "${0##*/}" = "autom4te" ] ; then
+	echo "ac-wrapper: Autoconf 2.13 doesn't contain autom4te." >&2
+	echo "            Either unset WANT_AUTOCONF or don't execute anything" >&2
+	echo "            that would use autom4te." >&2
+	exit 1
+fi
+
+binary_new="${0}-2.59"
+binary_old="${0}-2.13"
+binary="${binary_new}"
+
+#
+# autodetect routine
+#
+if [ -f "configure.ac" -o -f "configure.in" ] ; then
+	if [ "${WANT_AUTOCONF}" != "2.5" ] ; then 
+		if [ "${WANT_AUTOCONF}" = "2.1" ] ; then
+			if [ ! -f "configure.ac" ] ; then
+				binary="${binary_old}"
+			else
+				echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
+				echo "            autoconf 2.59, which conflicts with your choice and" >&2
+				echo "            causes error. You have two options:" >&2
+				echo "            1. Try execute command again after removing configure.ac" >&2
+				echo "            2. Don't set WANT_AUTOCONF" >&2
+				exit 1
+			fi
+		else
+			if [ -r "configure" ] ; then
+				confversion=$(awk \
+					'{
+					if (match($0,
+					          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
+					          res))
+						{ print res[3]; exit }
+					}' configure)
+			fi
+
+			if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then
+				binary="${binary_old}"
+			fi
+		fi
+	fi
+fi
+
+if [ "${WANT_ACWRAPPER_DEBUG}" ] ; then
+	if [ -n "${WANT_AUTOCONF}" ] ; then
+		echo "ac-wrapper: DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" >&2
+	fi
+	echo "ac-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+if [ "$binary" = "$binary_new" ] ; then
+	export WANT_AUTOCONF="2.5"
+elif [ "$binary" = "$binary_old" ] ; then
+	export WANT_AUTOCONF="2.1"
+fi
+
+if [ ! -x "$binary" ] ; then
+	# this shouldn't happen
+	echo "ac-wrapper: $binary is missing or not executable." >&2
+	echo "            Please try emerging the correct version of autoconf." >&2
+	exit 1
+fi
+
+exec "$binary" "$@"
+
+echo "ac-wrapper: was unable to exec $binary !?" >&2
+exit 1
-- 
cgit v1.2.3-65-gdbad


From 95b87c18e49df8e7e533676ed4dcabc2b8014977 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 5 Dec 2004 09:06:57 +0000
Subject: minor touchup

---
 ac-wrapper.sh | 51 ++++++++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 1f1810d..dca23bc 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-1.sh,v 1.1 2004/11/14 03:40:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-1.sh,v 1.2 2004/12/05 09:06:57 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -33,33 +33,30 @@ binary="${binary_new}"
 #
 # autodetect routine
 #
-if [ -f "configure.ac" -o -f "configure.in" ] ; then
-	if [ "${WANT_AUTOCONF}" != "2.5" ] ; then 
-		if [ "${WANT_AUTOCONF}" = "2.1" ] ; then
-			if [ ! -f "configure.ac" ] ; then
-				binary="${binary_old}"
-			else
-				echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
-				echo "            autoconf 2.59, which conflicts with your choice and" >&2
-				echo "            causes error. You have two options:" >&2
-				echo "            1. Try execute command again after removing configure.ac" >&2
-				echo "            2. Don't set WANT_AUTOCONF" >&2
-				exit 1
-			fi
+if [ "${WANT_AUTOCONF}" != "2.5" ] ; then 
+	if [ "${WANT_AUTOCONF}" = "2.1" ] ; then
+		if [ ! -f "configure.ac" ] ; then
+			binary="${binary_old}"
 		else
-			if [ -r "configure" ] ; then
-				confversion=$(awk \
-					'{
-					if (match($0,
-					          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
-					          res))
-						{ print res[3]; exit }
-					}' configure)
-			fi
-
-			if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then
-				binary="${binary_old}"
-			fi
+			echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
+			echo "            autoconf 2.59, which conflicts with your choice and" >&2
+			echo "            causes error. You have two options:" >&2
+			echo "            1. Try execute command again after removing configure.ac" >&2
+			echo "            2. Don't set WANT_AUTOCONF" >&2
+			exit 1
+		fi
+	else
+		if [ -r "configure" ] ; then
+			confversion=$(awk \
+				'{
+				if (match($0,
+				          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
+				          res))
+					{ print res[3]; exit }
+				}' configure)
+		fi
+		if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then
+			binary="${binary_old}"
 		fi
 	fi
 fi
-- 
cgit v1.2.3-65-gdbad


From b376375db1f6b51934bef8b04bd82bf212a9b3c6 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 6 Dec 2004 04:29:22 +0000
Subject: When guessing which version to run, dont try to use autoconf-2.1x if
 we are running automake-1.7 or better.

---
 ac-wrapper.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index dca23bc..97f559d 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-1.sh,v 1.2 2004/12/05 09:06:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh,v 1.1 2004/12/06 04:29:22 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -46,18 +46,23 @@ if [ "${WANT_AUTOCONF}" != "2.5" ] ; then
 			exit 1
 		fi
 	else
-		if [ -r "configure" ] ; then
-			confversion=$(awk \
-				'{
-				if (match($0,
-				          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
-				          res))
-					{ print res[3]; exit }
-				}' configure)
-		fi
-		if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then
-			binary="${binary_old}"
-		fi
+		# Automake-1.7 and better requie autoconf-2.5x
+		case "${WANT_AUTOMAKE}" in
+		1.[7-9]) ;;
+		*)
+			if [ -r "configure" ] ; then
+				confversion=$(awk \
+					'{
+					if (match($0,
+					          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
+					          res))
+						{ print res[3]; exit }
+					}' configure)
+			fi
+			if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then
+				binary="${binary_old}"
+			fi
+		esac
 	fi
 fi
 
-- 
cgit v1.2.3-65-gdbad


From 2ac351f9d4ac0c829ac1643ad2bc9f80203e4ca1 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 14 May 2005 17:42:00 +0000
Subject: use gawk, not awk #92582

Package-Manager: portage-2.0.51.21-r1
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 97f559d..b85fade 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh,v 1.1 2004/12/06 04:29:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh,v 1.2 2005/05/14 17:40:25 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -51,7 +51,7 @@ if [ "${WANT_AUTOCONF}" != "2.5" ] ; then
 		1.[7-9]) ;;
 		*)
 			if [ -r "configure" ] ; then
-				confversion=$(awk \
+				confversion=$(gawk \
 					'{
 					if (match($0,
 					          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
-- 
cgit v1.2.3-65-gdbad


From a330c130e3190aec8df251c755053d6c099b2f6c Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Tue, 28 Jun 2005 21:17:42 +0000
Subject: Add logic to check automake aux files for AC_PREREQ and run required
 autoconf version according to that. Some syntax cleanups.

Package-Manager: portage-2.0.51.22-r1
---
 ac-wrapper.sh | 54 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index b85fade..55250ae 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh,v 1.2 2005/05/14 17:40:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh,v 1.1 2005/06/28 21:17:42 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -14,12 +14,12 @@
 #     -or-
 #   - `configure' is already present and was generated by autoconf 2.13
 
-if [ "${0##*/}" = "ac-wrapper.sh" ] ; then
+if [[ ${0##*/} == "ac-wrapper.sh" ]] ; then
 	echo "Don't call this script directly" >&2
 	exit 1
 fi
 
-if [ "${WANT_AUTOCONF}" = "2.1" -a "${0##*/}" = "autom4te" ] ; then
+if [[ ${WANT_AUTOCONF} == "2.1" && ${0##*/} == "autom4te" ]] ; then
 	echo "ac-wrapper: Autoconf 2.13 doesn't contain autom4te." >&2
 	echo "            Either unset WANT_AUTOCONF or don't execute anything" >&2
 	echo "            that would use autom4te." >&2
@@ -28,15 +28,15 @@ fi
 
 binary_new="${0}-2.59"
 binary_old="${0}-2.13"
-binary="${binary_new}"
+binary=${binary_new}
 
 #
 # autodetect routine
 #
-if [ "${WANT_AUTOCONF}" != "2.5" ] ; then 
-	if [ "${WANT_AUTOCONF}" = "2.1" ] ; then
-		if [ ! -f "configure.ac" ] ; then
-			binary="${binary_old}"
+if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then 
+	if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then
+		if [[ ! -f "configure.ac" ]] ; then
+			binary=${binary_old}
 		else
 			echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
 			echo "            autoconf 2.59, which conflicts with your choice and" >&2
@@ -50,46 +50,58 @@ if [ "${WANT_AUTOCONF}" != "2.5" ] ; then
 		case "${WANT_AUTOMAKE}" in
 		1.[7-9]) ;;
 		*)
-			if [ -r "configure" ] ; then
+			acfiles=$(ls ac{local,include}.m4 2>/dev/null)
+			if [[ -n ${acfiles} ]] ; then
 				confversion=$(gawk \
-					'{
+				'{
+					if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
+						VERSIONS[COUNT++] = res[1]
+				}
+				END {
+					asort(VERSIONS)
+					print VERSIONS[COUNT]
+				}' ${acfiles})
+			fi
+			if [[ -z ${confversion} && -r "configure" ]] ; then
+				confversion=$(gawk \
+				'{
 					if (match($0,
 					          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
 					          res))
 						{ print res[3]; exit }
-					}' configure)
+				}' configure)
 			fi
-			if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then
+			if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
 				binary="${binary_old}"
 			fi
 		esac
 	fi
 fi
 
-if [ "${WANT_ACWRAPPER_DEBUG}" ] ; then
-	if [ -n "${WANT_AUTOCONF}" ] ; then
+if [[ -n ${WANT_ACWRAPPER_DEBUG} ]] ; then
+	if [[ -n ${WANT_AUTOCONF} ]] ; then
 		echo "ac-wrapper: DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" >&2
 	fi
-	echo "ac-wrapper: DEBUG: will execute <$binary>" >&2
+	echo "ac-wrapper: DEBUG: will execute <${binary}>" >&2
 fi
 
 #
 # for further consistency
 #
-if [ "$binary" = "$binary_new" ] ; then
+if [[ ${binary} == "${binary_new}" ]] ; then
 	export WANT_AUTOCONF="2.5"
-elif [ "$binary" = "$binary_old" ] ; then
+elif [[ ${binary} == "${binary_old}" ]] ; then
 	export WANT_AUTOCONF="2.1"
 fi
 
-if [ ! -x "$binary" ] ; then
+if [[ ! -x ${binary} ]] ; then
 	# this shouldn't happen
-	echo "ac-wrapper: $binary is missing or not executable." >&2
+	echo "ac-wrapper: ${binary} is missing or not executable." >&2
 	echo "            Please try emerging the correct version of autoconf." >&2
 	exit 1
 fi
 
-exec "$binary" "$@"
+exec "${binary}" "$@"
 
-echo "ac-wrapper: was unable to exec $binary !?" >&2
+echo "ac-wrapper: was unable to exec ${binary} !?" >&2
 exit 1
-- 
cgit v1.2.3-65-gdbad


From 0abb800b10a958f7809032c0eb95f3e69fb6f4ee Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Thu, 30 Jun 2005 12:58:52 +0000
Subject: Also check configure.{in,ac} for AC_PREREQ, bug #97470.

Package-Manager: portage-2.0.51.22-r1
---
 ac-wrapper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 55250ae..0c2a056 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh,v 1.1 2005/06/28 21:17:42 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh,v 1.2 2005/06/30 12:58:52 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -50,7 +50,7 @@ if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then
 		case "${WANT_AUTOMAKE}" in
 		1.[7-9]) ;;
 		*)
-			acfiles=$(ls ac{local,include}.m4 2>/dev/null)
+			acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
 			if [[ -n ${acfiles} ]] ; then
 				confversion=$(gawk \
 				'{
-- 
cgit v1.2.3-65-gdbad


From 0f29395680956410ff47d8f66781680a19829e80 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sat, 16 Jul 2005 20:28:42 +0000
Subject: Update to work with MacOS X.  Do not parse comments in acfiles.

Package-Manager: portage-2.0.51.22-r1
---
 ac-wrapper.sh | 93 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 21 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 0c2a056..fe6f398 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.sh,v 1.2 2005/06/30 12:58:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.1.sh,v 1.1 2005/07/16 20:28:42 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -30,6 +30,72 @@ binary_new="${0}-2.59"
 binary_old="${0}-2.13"
 binary=${binary_new}
 
+acprereq_version() {
+	# Add --posix to below awk to make sure it will run on macosx, etc
+	awk \
+	'($0 !~ /^[[:space:]]*(#|dnl)/) {
+		# The following is replaced by below, as we cannot use match()
+		# with a third argument with non-gawk (posix) versions of awk:
+		#
+		#if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
+		#	VERSIONS[COUNT++] = res[1]
+		#
+		sindex = match($0, /AC_PREREQ\(\[?([0-9]\.[0-9])/)
+		if (sindex > 0) {
+			sindex += length("AC_PREREQ(")
+			if (substr($0, sindex, 1) == "[")
+				sindex++
+			VERSIONS[COUNT++] = substr($0, sindex, 3)
+		}
+	}
+
+	END {
+		# The following is replaced by below, as we cannot use asort()
+		# with non-gawk (posix) versions of awk:
+		#
+		#asort(VERSIONS)
+		#
+		VERSION = VERSIONS[0]
+		for (x = 0; x <= COUNT;x++)
+			if (VERSIONS[x] > VERSION)
+				VERSION=VERSIONS[x]
+		
+		print VERSION
+	}' "$@"
+}
+
+generated_version() {
+	# Add --posix to below awk to make sure it will run on macosx, etc
+	awk \
+	'{
+		# The following is replaced by below, as we cannot use match()
+		# with a third argument with non-gawk (posix) versions of awk:
+		#
+		#if (match($0,
+		#	  "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
+		#	  res))
+		#	{ print res[3]; exit }
+		#
+		# First try for newer versions of autoconf
+		sindex = match($0, /Generated by GNU Autoconf ([0-9]\.[0-9])/)
+		if (sindex > 0)
+			# Now chop the first part before the version
+			sindex += length("Generated by GNU Autoconf ")
+		# No version, so try older versions of autoconf
+		if (sindex <= 0) {
+			sindex = match($0, /Generated automatically using autoconf version ([0-9]\.[0-9])/)
+			if (sindex > 0)
+				sindex += length("Generated automatically using autoconf version ")
+		}
+
+		# Ok, we got a version
+		if (sindex > 0) {
+			print substr($0, sindex, 3)
+			exit
+		}
+	}' "$@"
+}
+
 #
 # autodetect routine
 #
@@ -51,26 +117,11 @@ if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then
 		1.[7-9]) ;;
 		*)
 			acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
-			if [[ -n ${acfiles} ]] ; then
-				confversion=$(gawk \
-				'{
-					if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
-						VERSIONS[COUNT++] = res[1]
-				}
-				END {
-					asort(VERSIONS)
-					print VERSIONS[COUNT]
-				}' ${acfiles})
-			fi
-			if [[ -z ${confversion} && -r "configure" ]] ; then
-				confversion=$(gawk \
-				'{
-					if (match($0,
-					          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
-					          res))
-						{ print res[3]; exit }
-				}' configure)
-			fi
+			[[ -n ${acfiles} ]] && confversion=$(acprereq_version ${acfiles})
+			
+			[[ -z ${confversion} && -r "configure" ]] && \
+				confversion=$(generated_version configure)
+
 			if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
 				binary="${binary_old}"
 			fi
-- 
cgit v1.2.3-65-gdbad


From 0a62fb9b738e27c545eb7d6f227d241cfcf63fc2 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sat, 16 Jul 2005 20:31:59 +0000
Subject: Add another comment.

Package-Manager: portage-2.0.51.22-r1
---
 ac-wrapper.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index fe6f398..8f4be44 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.1.sh,v 1.1 2005/07/16 20:28:42 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.1.sh,v 1.2 2005/07/16 20:31:59 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -56,6 +56,7 @@ acprereq_version() {
 		#asort(VERSIONS)
 		#
 		VERSION = VERSIONS[0]
+		# We need to get the biggest version and print that
 		for (x = 0; x <= COUNT;x++)
 			if (VERSIONS[x] > VERSION)
 				VERSION=VERSIONS[x]
-- 
cgit v1.2.3-65-gdbad


From 3230b9c5df35b31eafc379d2f01ecf6d41512799 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sat, 16 Jul 2005 20:42:12 +0000
Subject: Update explanation of when 2.1 is run.

Package-Manager: portage-2.0.51.22-r1
---
 ac-wrapper.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 8f4be44..d01e31a 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.1.sh,v 1.2 2005/07/16 20:31:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.1.sh,v 1.3 2005/07/16 20:42:12 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -12,6 +12,8 @@
 # - runs autoconf 2.13 only if:
 #   - envvar WANT_AUTOCONF is set to `2.1'
 #     -or-
+#   - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher)
+#     -or-
 #   - `configure' is already present and was generated by autoconf 2.13
 
 if [[ ${0##*/} == "ac-wrapper.sh" ]] ; then
-- 
cgit v1.2.3-65-gdbad


From 159c081093fb8d1acd9cf5c59d22151c308a1b69 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Fri, 9 Sep 2005 23:15:25 +0000
Subject: Remove awk compat crap as gawk now works on Darwin.

Package-Manager: portage-2.0.52-r1
---
 ac-wrapper.sh | 64 ++++++++++-------------------------------------------------
 1 file changed, 11 insertions(+), 53 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index d01e31a..9701f84 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.1.sh,v 1.3 2005/07/16 20:42:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh,v 1.1 2005/09/09 23:15:25 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -33,67 +33,25 @@ binary_old="${0}-2.13"
 binary=${binary_new}
 
 acprereq_version() {
-	# Add --posix to below awk to make sure it will run on macosx, etc
-	awk \
+	gawk \
 	'($0 !~ /^[[:space:]]*(#|dnl)/) {
-		# The following is replaced by below, as we cannot use match()
-		# with a third argument with non-gawk (posix) versions of awk:
-		#
-		#if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
-		#	VERSIONS[COUNT++] = res[1]
-		#
-		sindex = match($0, /AC_PREREQ\(\[?([0-9]\.[0-9])/)
-		if (sindex > 0) {
-			sindex += length("AC_PREREQ(")
-			if (substr($0, sindex, 1) == "[")
-				sindex++
-			VERSIONS[COUNT++] = substr($0, sindex, 3)
-		}
+		if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
+			VERSIONS[COUNT++] = res[1]
 	}
 
 	END {
-		# The following is replaced by below, as we cannot use asort()
-		# with non-gawk (posix) versions of awk:
-		#
-		#asort(VERSIONS)
-		#
-		VERSION = VERSIONS[0]
-		# We need to get the biggest version and print that
-		for (x = 0; x <= COUNT;x++)
-			if (VERSIONS[x] > VERSION)
-				VERSION=VERSIONS[x]
-		
-		print VERSION
+		asort(VERSIONS)
+		print VERSIONS[COUNT]
 	}' "$@"
 }
 
 generated_version() {
-	# Add --posix to below awk to make sure it will run on macosx, etc
-	awk \
+	gawk \
 	'{
-		# The following is replaced by below, as we cannot use match()
-		# with a third argument with non-gawk (posix) versions of awk:
-		#
-		#if (match($0,
-		#	  "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
-		#	  res))
-		#	{ print res[3]; exit }
-		#
-		# First try for newer versions of autoconf
-		sindex = match($0, /Generated by GNU Autoconf ([0-9]\.[0-9])/)
-		if (sindex > 0)
-			# Now chop the first part before the version
-			sindex += length("Generated by GNU Autoconf ")
-		# No version, so try older versions of autoconf
-		if (sindex <= 0) {
-			sindex = match($0, /Generated automatically using autoconf version ([0-9]\.[0-9])/)
-			if (sindex > 0)
-				sindex += length("Generated automatically using autoconf version ")
-		}
-
-		# Ok, we got a version
-		if (sindex > 0) {
-			print substr($0, sindex, 3)
+		if (match($0,
+		          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
+		          res)) {
+			print res[3]
 			exit
 		}
 	}' "$@"
-- 
cgit v1.2.3-65-gdbad


From 745dc8d10eeabecb2eba541bdb7b87f5ca632600 Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Thu, 29 Jun 2006 06:45:51 +0000
Subject: Update wrapper to be more generic with different versions of
 autconf-2.59 or later. Package-Manager: portage-2.1.1_pre1-r5

---
 ac-wrapper.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 9701f84..ad4ca4a 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.2.sh,v 1.1 2005/09/09 23:15:25 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.3.sh,v 1.1 2006/06/29 06:45:51 azarah Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -28,7 +28,13 @@ if [[ ${WANT_AUTOCONF} == "2.1" && ${0##*/} == "autom4te" ]] ; then
 	exit 1
 fi
 
-binary_new="${0}-2.59"
+if type -p autoconf-2.60 &>/dev/null ; then
+	binary_new="${0}-2.60"
+elif type -p autoconf-2.59d &>/dev/null ; then
+	binary_new="${0}-2.59d"
+else
+	binary_new="${0}-2.59"
+fi
 binary_old="${0}-2.13"
 binary=${binary_new}
 
-- 
cgit v1.2.3-65-gdbad


From bca7a3560203ce81a09b439e2eb1102dfa2d1be9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 5 Nov 2006 08:44:41 +0000
Subject: Add a more flexible wrapper using stuff from automake-wrapper-3 and
 allow WANT_AUTOCONF to be a space delimited list.

Package-Manager: portage-2.1.2_rc1-r2
---
 ac-wrapper.sh | 127 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 83 insertions(+), 44 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index ad4ca4a..37b9493 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-3.3.sh,v 1.1 2006/06/29 06:45:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.1 2006/11/05 08:44:41 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
 #
 # Executes the correct autoconf version.
 #
-# - defaults to latest version (2.5x)
-# - runs autoconf 2.13 only if:
+# - defaults to newest version available (hopefully autoconf-2.60)
+# - runs autoconf 2.13 if:
 #   - envvar WANT_AUTOCONF is set to `2.1'
 #     -or-
 #   - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher)
@@ -28,16 +28,54 @@ if [[ ${WANT_AUTOCONF} == "2.1" && ${0##*/} == "autom4te" ]] ; then
 	exit 1
 fi
 
-if type -p autoconf-2.60 &>/dev/null ; then
-	binary_new="${0}-2.60"
-elif type -p autoconf-2.59d &>/dev/null ; then
-	binary_new="${0}-2.59d"
-else
-	binary_new="${0}-2.59"
+#
+# Set up bindings between actual version and WANT_AUTOCONF
+#
+vers="2.60:2.5 2.59:2.5 2.13:2.1"
+
+binary=""
+for v in ${vers} ; do
+	auto_ver=${v%:*} # aka 2.60
+	want_ver=${v#*:} # aka 2.5
+	eval binary_${want_ver/./_}="${0}-${auto_ver}"
+
+	if [ -z "${binary}" ] && [ -x "${0}-${auto_ver}" ] ; then
+		binary="${0}-${auto_ver}"
+	fi
+done
+if [ -z "${binary}" ] ; then
+	echo "ac-wrapper: Unable to locate any usuable version of autoconf." >&2
+	echo "            I tried these versions: ${vers}" >&2
+	echo "            With a base name of '${0}'." >&2
+	exit 1
+fi
+
+#
+# Check the WANT_AUTOCONF setting.  We accept a whitespace delimited
+# list of autoconf versions.
+#
+if [ -n "${WANT_AUTOCONF}" ] ; then
+	for v in ${vers} x ; do
+		if [ "${v}" = "x" ] ; then
+			echo "ac-wrapper: warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring." >&2
+			unset WANT_AUTOCONF
+			break
+		fi
+
+		want_ver=${v#*:}
+		for wx in ${WANT_AUTOCONF} ; do
+			if [ "${wx}" = "${want_ver}" ] ; then
+				binary="binary_${want_ver/./_}"
+				binary="${!binary}"
+				break
+			fi
+		done
+	done
 fi
-binary_old="${0}-2.13"
-binary=${binary_new}
 
+#
+# autodetect helpers
+#
 acprereq_version() {
 	gawk \
 	'($0 !~ /^[[:space:]]*(#|dnl)/) {
@@ -66,34 +104,30 @@ generated_version() {
 #
 # autodetect routine
 #
-if [[ ${WANT_AUTOCONF} != "2.5" ]] ; then 
-	if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then
-		if [[ ! -f "configure.ac" ]] ; then
-			binary=${binary_old}
-		else
-			echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
-			echo "            autoconf 2.59, which conflicts with your choice and" >&2
-			echo "            causes error. You have two options:" >&2
-			echo "            1. Try execute command again after removing configure.ac" >&2
-			echo "            2. Don't set WANT_AUTOCONF" >&2
-			exit 1
+if [[ ${WANT_AUTOCONF} == "2.1" ]] && [ -f "configure.ac" ] ; then
+	echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
+	echo "            autoconf 2.59+, which conflicts with your choice and" >&2
+	echo "            causes error. You have two options:" >&2
+	echo "            1. Try execute command again after removing configure.ac" >&2
+	echo "            2. Don't set WANT_AUTOCONF" >&2
+	exit 1
+fi
+
+if [[ ${WANT_AUTOCONF} != "2.5" ]] && [[ -n ${WANT_AUTOMAKE} ]] ; then
+	# Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
+	# is set to an older version, let's do some sanity checks.
+	case "${WANT_AUTOMAKE}" in
+	1.[456])
+		acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
+		[[ -n ${acfiles} ]] && confversion=$(acprereq_version ${acfiles})
+		
+		[[ -z ${confversion} && -r "configure" ]] \
+			&& confversion=$(generated_version configure)
+
+		if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
+			binary="${binary_2_1}"
 		fi
-	else
-		# Automake-1.7 and better requie autoconf-2.5x
-		case "${WANT_AUTOMAKE}" in
-		1.[7-9]) ;;
-		*)
-			acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
-			[[ -n ${acfiles} ]] && confversion=$(acprereq_version ${acfiles})
-			
-			[[ -z ${confversion} && -r "configure" ]] && \
-				confversion=$(generated_version configure)
-
-			if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
-				binary="${binary_old}"
-			fi
-		esac
-	fi
+	esac
 fi
 
 if [[ -n ${WANT_ACWRAPPER_DEBUG} ]] ; then
@@ -106,12 +140,17 @@ fi
 #
 # for further consistency
 #
-if [[ ${binary} == "${binary_new}" ]] ; then
-	export WANT_AUTOCONF="2.5"
-elif [[ ${binary} == "${binary_old}" ]] ; then
-	export WANT_AUTOCONF="2.1"
-fi
+for v in ${vers} ; do
+	want_ver=${v#*:}
+	mybin="binary_${want_ver/./_}"
+	if [ "${binary}" = "${!mybin}" ] ; then
+		export WANT_AUTOMAKE="${want_ver}"
+	fi
+done
 
+#
+# Now try to run the binary
+#
 if [[ ! -x ${binary} ]] ; then
 	# this shouldn't happen
 	echo "ac-wrapper: ${binary} is missing or not executable." >&2
-- 
cgit v1.2.3-65-gdbad


From e77f8a363811ee4ce5adb93e4e2ebaa4bc3f9686 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 5 Nov 2006 10:24:37 +0000
Subject: Fix up SLOT/VER collision as pointed out by Alexis Ballier.

Package-Manager: portage-2.1.2_rc1-r2
---
 ac-wrapper.sh | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 37b9493..993fbb5 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.1 2006/11/05 08:44:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.2 2006/11/05 10:24:37 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -35,10 +35,7 @@ vers="2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-	auto_ver=${v%:*} # aka 2.60
-	want_ver=${v#*:} # aka 2.5
-	eval binary_${want_ver/./_}="${0}-${auto_ver}"
-
+	auto_ver=${v%:*}
 	if [ -z "${binary}" ] && [ -x "${0}-${auto_ver}" ] ; then
 		binary="${0}-${auto_ver}"
 	fi
@@ -62,14 +59,15 @@ if [ -n "${WANT_AUTOCONF}" ] ; then
 			break
 		fi
 
+		auto_ver=${v%:*}
 		want_ver=${v#*:}
 		for wx in ${WANT_AUTOCONF} ; do
-			if [ "${wx}" = "${want_ver}" ] ; then
-				binary="binary_${want_ver/./_}"
-				binary="${!binary}"
-				break
+			if [ "${wx}" = "${want_ver}" ] && [ -x "${0}-${auto_ver}" ] ; then
+				binary="${0}-${auto_ver}"
+				v="x"
 			fi
 		done
+		[ "${v}" = "x" ] && break
 	done
 fi
 
@@ -125,7 +123,7 @@ if [[ ${WANT_AUTOCONF} != "2.5" ]] && [[ -n ${WANT_AUTOMAKE} ]] ; then
 			&& confversion=$(generated_version configure)
 
 		if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
-			binary="${binary_2_1}"
+			binary="${0}-2.13"
 		fi
 	esac
 fi
@@ -141,9 +139,9 @@ fi
 # for further consistency
 #
 for v in ${vers} ; do
+	auto_ver=${v%:*}
 	want_ver=${v#*:}
-	mybin="binary_${want_ver/./_}"
-	if [ "${binary}" = "${!mybin}" ] ; then
+	if [ "${binary}" = "${0}-${auto_ver}" ] ; then
 		export WANT_AUTOMAKE="${want_ver}"
 	fi
 done
-- 
cgit v1.2.3-65-gdbad


From a8ae7cdb985b41a0b62f0c76acef4e56ebdc48d6 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 17 Nov 2006 20:17:07 +0000
Subject: Add support for autoconf-2.61.

Package-Manager: portage-2.1.2_rc1-r7
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 993fbb5..ed60335 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.2 2006/11/05 10:24:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.3 2006/11/17 20:17:07 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -31,7 +31,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From 00be30012050114b44d440ac344ea02ab4331008 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 26 Nov 2006 14:35:36 +0000
Subject: Fix WANT_AUTOMAKE/WANT_AUTOCONF typo #156050 by Sandro.

Package-Manager: portage-2.1.2_rc2-r2
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index ed60335..5606e8c 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.3 2006/11/17 20:17:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.4 2006/11/26 14:35:36 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -142,7 +142,7 @@ for v in ${vers} ; do
 	auto_ver=${v%:*}
 	want_ver=${v#*:}
 	if [ "${binary}" = "${0}-${auto_ver}" ] ; then
-		export WANT_AUTOMAKE="${want_ver}"
+		export WANT_AUTOCONF="${want_ver}"
 	fi
 done
 
-- 
cgit v1.2.3-65-gdbad


From a6fe53380fa2c80204f37a683afdfa9b6ca6e3f5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 10 Apr 2008 08:05:52 +0000
Subject: Add support for autoconf-2.62 #217087.

Package-Manager: portage-2.2_pre5
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 5606e8c..baf1131 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.4 2006/11/26 14:35:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-5.sh,v 1.1 2008/04/10 08:05:52 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -31,7 +31,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From 3d011a910bd958b1ed18d1111ae63b61ac2581ee Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 20 Sep 2008 17:46:47 +0000
Subject: Add support for autoconf-2.63.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index baf1131..cc0328b 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-5.sh,v 1.1 2008/04/10 08:05:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-6.sh,v 1.1 2008/09/20 17:46:47 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -31,7 +31,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From b5da5bf0ca79869e288b88895876088246543cb7 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 27 Jul 2009 04:15:07 +0000
Subject: Support autoconf-2.64.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index cc0328b..f9b43d4 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-6.sh,v 1.1 2008/09/20 17:46:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-7.sh,v 1.1 2009/07/27 04:15:07 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -31,7 +31,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From 8ae9b04509bbda6cd81b7b6d1c6104a4953709f6 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 21 Nov 2009 19:08:54 +0000
Subject: Support autoconf-2.65 and switch to POSIX sh.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64
---
 ac-wrapper.sh | 73 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index f9b43d4..b39f02e 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
-# Copyright 1999-2006 Gentoo Foundation
+#!/bin/sh
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-7.sh,v 1.1 2009/07/27 04:15:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-8.sh,v 1.1 2009/11/21 19:08:54 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -16,22 +16,23 @@
 #     -or-
 #   - `configure' is already present and was generated by autoconf 2.13
 
-if [[ ${0##*/} == "ac-wrapper.sh" ]] ; then
-	echo "Don't call this script directly" >&2
-	exit 1
+warn() { printf "ac-wrapper: $*\n" 1>&2; }
+err() { warn "$@"; exit 1; }
+
+if [ "${0##*/}" = "ac-wrapper.sh" ] ; then
+	err "Don't call this script directly"
 fi
 
-if [[ ${WANT_AUTOCONF} == "2.1" && ${0##*/} == "autom4te" ]] ; then
-	echo "ac-wrapper: Autoconf 2.13 doesn't contain autom4te." >&2
-	echo "            Either unset WANT_AUTOCONF or don't execute anything" >&2
-	echo "            that would use autom4te." >&2
-	exit 1
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${0##*/}" = "autom4te" ] ; then
+	err "Autoconf 2.13 doesn't contain autom4te.\n" \
+	    "   Either unset WANT_AUTOCONF or don't execute anything\n" \
+	    "   that would use autom4te."
 fi
 
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
@@ -41,10 +42,9 @@ for v in ${vers} ; do
 	fi
 done
 if [ -z "${binary}" ] ; then
-	echo "ac-wrapper: Unable to locate any usuable version of autoconf." >&2
-	echo "            I tried these versions: ${vers}" >&2
-	echo "            With a base name of '${0}'." >&2
-	exit 1
+	err "Unable to locate any usuable version of autoconf.\n" \
+	    "\tI tried these versions: ${vers}\n" \
+	    "\tWith a base name of '${0}'."
 fi
 
 #
@@ -54,7 +54,7 @@ fi
 if [ -n "${WANT_AUTOCONF}" ] ; then
 	for v in ${vers} x ; do
 		if [ "${v}" = "x" ] ; then
-			echo "ac-wrapper: warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring." >&2
+			warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring."
 			unset WANT_AUTOCONF
 			break
 		fi
@@ -102,37 +102,36 @@ generated_version() {
 #
 # autodetect routine
 #
-if [[ ${WANT_AUTOCONF} == "2.1" ]] && [ -f "configure.ac" ] ; then
-	echo "ac-wrapper: Since configure.ac is present, aclocal always use" >&2
-	echo "            autoconf 2.59+, which conflicts with your choice and" >&2
-	echo "            causes error. You have two options:" >&2
-	echo "            1. Try execute command again after removing configure.ac" >&2
-	echo "            2. Don't set WANT_AUTOCONF" >&2
-	exit 1
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then
+	err "Since configure.ac is present, aclocal always use\n" \
+	    "\tautoconf 2.59+, which conflicts with your choice and\n" \
+	    "\tcauses error. You have two options:\n" \
+	    "\t1. Try execute command again after removing configure.ac\n" \
+	    "\t2. Don't set WANT_AUTOCONF"
 fi
 
-if [[ ${WANT_AUTOCONF} != "2.5" ]] && [[ -n ${WANT_AUTOMAKE} ]] ; then
+if [ "${WANT_AUTOCONF}" != "2.5" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
 	# Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
 	# is set to an older version, let's do some sanity checks.
 	case "${WANT_AUTOMAKE}" in
 	1.[456])
 		acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
-		[[ -n ${acfiles} ]] && confversion=$(acprereq_version ${acfiles})
+		[ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
 		
-		[[ -z ${confversion} && -r "configure" ]] \
+		[ -z "${confversion}" ] && [ -r "configure" ] \
 			&& confversion=$(generated_version configure)
 
-		if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then
+		if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then
 			binary="${0}-2.13"
 		fi
 	esac
 fi
 
-if [[ -n ${WANT_ACWRAPPER_DEBUG} ]] ; then
-	if [[ -n ${WANT_AUTOCONF} ]] ; then
-		echo "ac-wrapper: DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" >&2
+if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then
+	if [ -n "${WANT_AUTOCONF}" ] ; then
+		warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}"
 	fi
-	echo "ac-wrapper: DEBUG: will execute <${binary}>" >&2
+	warn "DEBUG: will execute <${binary}>"
 fi
 
 #
@@ -149,14 +148,12 @@ done
 #
 # Now try to run the binary
 #
-if [[ ! -x ${binary} ]] ; then
+if [ ! -x "${binary}" ] ; then
 	# this shouldn't happen
-	echo "ac-wrapper: ${binary} is missing or not executable." >&2
-	echo "            Please try emerging the correct version of autoconf." >&2
-	exit 1
+	err "${binary} is missing or not executable.\n" \
+	    "\tPlease try emerging the correct version of autoconf."
 fi
 
 exec "${binary}" "$@"
 
-echo "ac-wrapper: was unable to exec ${binary} !?" >&2
-exit 1
+err "ac-wrapper: was unable to exec ${binary} !?"
-- 
cgit v1.2.3-65-gdbad


From 3ccc5b82087e7785f234f92be6b24c3b691b7f72 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 7 Mar 2010 15:01:09 +0000
Subject: fix double "ac-wrapper:" output in last error message

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
---
 ac-wrapper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index b39f02e..73a4840 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-8.sh,v 1.1 2009/11/21 19:08:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-8.sh,v 1.2 2010/03/07 15:01:09 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -156,4 +156,4 @@ fi
 
 exec "${binary}" "$@"
 
-err "ac-wrapper: was unable to exec ${binary} !?"
+err "was unable to exec ${binary} !?"
-- 
cgit v1.2.3-65-gdbad


From 47cd50acb8856589a5e8992ba18d24223eb1e96b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 3 Jul 2010 17:58:12 +0000
Subject: Support autoconf-2.66.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 73a4840..8d87653 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-8.sh,v 1.2 2010/03/07 15:01:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh,v 1.1 2010/07/03 17:58:12 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -32,7 +32,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From 0bd2bd6ccb3fa7a9c7595388e86820247650143e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 7 Aug 2010 20:43:35 +0000
Subject: Remove duplication between ebuild/wrapper.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 8d87653..6947e35 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh,v 1.1 2010/07/03 17:58:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh,v 1.2 2010/08/07 20:43:35 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -32,7 +32,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.67:2.5 2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From 1047e402eeeca5d3fb687ac62af0b7ecafb858b4 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 22 Sep 2010 23:52:55 +0000
Subject: Version bump for autoconf-2.68.

Package-Manager: portage-2.2_rc85/cvs/Linux x86_64
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 6947e35..1c0db8f 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh,v 1.2 2010/08/07 20:43:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-10.sh,v 1.1 2010/09/22 23:52:55 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -32,7 +32,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.67:2.5 2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="$(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From f6636ca9d0993e27f3c92eb4b380a258bb04b731 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 24 Sep 2010 02:20:33 +0000
Subject: Add seq fallback for crappy systems #338518 by Javier Villavicencio.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64
---
 ac-wrapper.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 1c0db8f..b42aad3 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-10.sh,v 1.1 2010/09/22 23:52:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-10.sh,v 1.2 2010/09/24 02:20:33 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -29,6 +29,24 @@ if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${0##*/}" = "autom4te" ] ; then
 	    "   that would use autom4te."
 fi
 
+if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
+	seq() {
+		local f l i
+		case $# in
+			1) f=1 i=1 l=$1;;
+			2) f=$1 i=1 l=$2;;
+			3) f=$1 i=$2 l=$3;;
+		esac
+		while :; do
+			[ $l -lt $f -a $i -gt 0 ] && break
+			[ $f -lt $l -a $i -lt 0 ] && break
+			echo $f
+			: $(( f += i ))
+		done
+		return 0
+	}
+fi
+
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-- 
cgit v1.2.3-65-gdbad


From b79aa6abbe218a870786bca34822963edc09b218 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 11 Jun 2011 23:37:38 +0000
Subject: Support autoconf-9999 #370753.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
---
 ac-wrapper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index b42aad3..3f3ace4 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-10.sh,v 1.2 2010/09/24 02:20:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-11.sh,v 1.1 2011/06/11 23:37:38 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -50,7 +50,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="$(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
+vers="9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
-- 
cgit v1.2.3-65-gdbad


From 1d659fe7e6736099474a1386fb985f2b96cab8f9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 2 Oct 2011 19:39:07 +0000
Subject: Optimize version lookup a bit, and handle the case where $0 is not a
 full path #385201 by Florian Philipp.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
---
 ac-wrapper.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 3f3ace4..12bb409 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-11.sh,v 1.1 2011/06/11 23:37:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-12.sh,v 1.1 2011/10/02 19:39:07 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -18,12 +18,40 @@
 
 warn() { printf "ac-wrapper: $*\n" 1>&2; }
 err() { warn "$@"; exit 1; }
+unset IFS
+which() {
+	local p
+	IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
+	for p in ${PATH} ; do
+		p="${p}/$1"
+		[ -e "${p}" ] && echo "${p}" && return 0
+	done
+	unset IFS
+	return 1
+}
 
-if [ "${0##*/}" = "ac-wrapper.sh" ] ; then
+#
+# Sanitize argv[0] since it isn't always a full path #385201
+#
+argv0=${0##*/}
+case ${0} in
+	${argv0})
+		# find it in PATH
+		if ! full_argv0=$(which "${argv0}") ; then
+			err "could not locate ${argv0}; file a bug"
+		fi
+		;;
+	*)
+		# re-use full/relative paths
+		full_argv0=$0
+		;;
+esac
+
+if [ "${argv0}" = "ac-wrapper.sh" ] ; then
 	err "Don't call this script directly"
 fi
 
-if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${0##*/}" = "autom4te" ] ; then
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${argv0}" = "autom4te" ] ; then
 	err "Autoconf 2.13 doesn't contain autom4te.\n" \
 	    "   Either unset WANT_AUTOCONF or don't execute anything\n" \
 	    "   that would use autom4te."
@@ -48,21 +76,24 @@ if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
 fi
 
 #
-# Set up bindings between actual version and WANT_AUTOCONF
+# Set up bindings between actual version and WANT_AUTOCONF;
+# Start at last known stable to speed up lookup process.
 #
-vers="9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
+STABLE_AUTOCONF="2.68:2.5"
+vers="${STABLE_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
 	auto_ver=${v%:*}
-	if [ -z "${binary}" ] && [ -x "${0}-${auto_ver}" ] ; then
-		binary="${0}-${auto_ver}"
+	if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
+		binary="${full_argv0}-${auto_ver}"
+		break
 	fi
 done
 if [ -z "${binary}" ] ; then
 	err "Unable to locate any usuable version of autoconf.\n" \
 	    "\tI tried these versions: ${vers}\n" \
-	    "\tWith a base name of '${0}'."
+	    "\tWith a base name of '${full_argv0}'."
 fi
 
 #
@@ -80,8 +111,8 @@ if [ -n "${WANT_AUTOCONF}" ] ; then
 		auto_ver=${v%:*}
 		want_ver=${v#*:}
 		for wx in ${WANT_AUTOCONF} ; do
-			if [ "${wx}" = "${want_ver}" ] && [ -x "${0}-${auto_ver}" ] ; then
-				binary="${0}-${auto_ver}"
+			if [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
+				binary="${full_argv0}-${auto_ver}"
 				v="x"
 			fi
 		done
@@ -135,12 +166,12 @@ if [ "${WANT_AUTOCONF}" != "2.5" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
 	1.[456])
 		acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
 		[ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
-		
+
 		[ -z "${confversion}" ] && [ -r "configure" ] \
 			&& confversion=$(generated_version configure)
 
 		if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then
-			binary="${0}-2.13"
+			binary="${full_argv0}-2.13"
 		fi
 	esac
 fi
@@ -158,8 +189,9 @@ fi
 for v in ${vers} ; do
 	auto_ver=${v%:*}
 	want_ver=${v#*:}
-	if [ "${binary}" = "${0}-${auto_ver}" ] ; then
+	if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then
 		export WANT_AUTOCONF="${want_ver}"
+		break
 	fi
 done
 
-- 
cgit v1.2.3-65-gdbad


From bc7dd97167eb73ef068c8b244b9defe75891596f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 16 Apr 2013 18:49:17 +0000
Subject: Support multislot-ed autoconf versions.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
---
 ac-wrapper.sh | 65 ++++++++++++++++++++++++++---------------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 12bb409..9d07d35 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-12.sh,v 1.1 2011/10/02 19:39:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh,v 1.1 2013/04/16 18:48:33 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -77,10 +77,10 @@ fi
 
 #
 # Set up bindings between actual version and WANT_AUTOCONF;
-# Start at last known stable to speed up lookup process.
+# Start at last known unstable/stable versions to speed up lookup process.
 #
-STABLE_AUTOCONF="2.68:2.5"
-vers="${STABLE_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
+KNOWN_AUTOCONF="2.69:2.5 2.68:2.5"
+vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do
@@ -111,7 +111,10 @@ if [ -n "${WANT_AUTOCONF}" ] ; then
 		auto_ver=${v%:*}
 		want_ver=${v#*:}
 		for wx in ${WANT_AUTOCONF} ; do
-			if [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
+			if [ -x "${full_argv0}-${wx}" ] ; then
+				binary="${full_argv0}-${wx}"
+				v="x"
+			elif [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
 				binary="${full_argv0}-${auto_ver}"
 				v="x"
 			fi
@@ -124,28 +127,17 @@ fi
 # autodetect helpers
 #
 acprereq_version() {
-	gawk \
-	'($0 !~ /^[[:space:]]*(#|dnl)/) {
-		if (match($0, "AC_PREREQ\\(\\[?([0-9]\\.[0-9])", res))
-			VERSIONS[COUNT++] = res[1]
-	}
-
-	END {
-		asort(VERSIONS)
-		print VERSIONS[COUNT]
-	}' "$@"
+	sed -n -r \
+		-e '/^\s*(#|dnl)/d' \
+		-e '/AC_PREREQ/s:.*AC_PREREQ\s*\(\[?\s*([0-9.]+)\s*\]?\):\1:p' \
+		"$@" |
+	LC_ALL=C sort -n -t . |
+	tail -1
 }
 
 generated_version() {
-	gawk \
-	'{
-		if (match($0,
-		          "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])",
-		          res)) {
-			print res[3]
-			exit
-		}
-	}' "$@"
+	local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*'
+	sed -n -r "/${re}/{s:${re}:\3:;p;q}" "$@"
 }
 
 #
@@ -159,7 +151,7 @@ if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then
 	    "\t2. Don't set WANT_AUTOCONF"
 fi
 
-if [ "${WANT_AUTOCONF}" != "2.5" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
+if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
 	# Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
 	# is set to an older version, let's do some sanity checks.
 	case "${WANT_AUTOMAKE}" in
@@ -186,14 +178,16 @@ fi
 #
 # for further consistency
 #
-for v in ${vers} ; do
-	auto_ver=${v%:*}
-	want_ver=${v#*:}
-	if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then
-		export WANT_AUTOCONF="${want_ver}"
-		break
-	fi
-done
+if [ -z "${WANT_AUTOCONF}" ] ; then
+	for v in ${vers} ; do
+		auto_ver=${v%:*}
+		want_ver=${v#*:}
+		if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then
+			export WANT_AUTOCONF="${want_ver}"
+			break
+		fi
+	done
+fi
 
 #
 # Now try to run the binary
@@ -205,5 +199,4 @@ if [ ! -x "${binary}" ] ; then
 fi
 
 exec "${binary}" "$@"
-
-err "was unable to exec ${binary} !?"
+# The shell will error out if `exec` failed.
-- 
cgit v1.2.3-65-gdbad


From b71a28e1a83aa2db86530ed2633b36baa11d4199 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Tue, 28 Feb 2017 21:39:46 +0100
Subject: Drop remaining $Id$ and $Header$ from files.

Bug: 611234
---
 ac-wrapper.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 9d07d35..d4324cf 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh,v 1.1 2013/04/16 18:48:33 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
-- 
cgit v1.2.3-65-gdbad


From 13b74cd1f92a2f2041999ed44dce659c74feb727 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 26 Apr 2018 12:37:11 +0200
Subject: sys-devel/autoconf-wrapper: Don't use bashisms.

Closes: https://bugs.gentoo.org/650152
Package-Manager: Portage-2.3.31, Repoman-2.3.9
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index d4324cf..d984b4a 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
@@ -155,7 +155,7 @@ if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
 	# is set to an older version, let's do some sanity checks.
 	case "${WANT_AUTOMAKE}" in
 	1.[456])
-		acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
+		acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null)
 		[ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
 
 		[ -z "${confversion}" ] && [ -r "configure" ] \
-- 
cgit v1.2.3-65-gdbad


From 3f7f87a39363836b54fc6b85486ac3266da2f3fe Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 15 Oct 2020 17:46:03 +0200
Subject: sys-devel/autoconf-wrapper: Bump to version 14_pre1

Bug: https://bugs.gentoo.org/732648
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 ac-wrapper.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index d984b4a..58c7d61 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
@@ -78,7 +78,9 @@ fi
 # Set up bindings between actual version and WANT_AUTOCONF;
 # Start at last known unstable/stable versions to speed up lookup process.
 #
-KNOWN_AUTOCONF="2.69:2.5 2.68:2.5"
+if [ -z "${KNOWN_AUTOCONF}" ]; then
+	KNOWN_AUTOCONF="2.70_beta2:2.5 2.69:2.5"
+fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
 binary=""
-- 
cgit v1.2.3-65-gdbad


From e0963d5fc5ae8c6b77c66a98b3e0aeefbb98246d Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 15 Oct 2020 20:27:24 +0200
Subject: sys-devel/autoconf-wrapper: Style fix

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 ac-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 58c7d61..80cffcd 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -78,7 +78,7 @@ fi
 # Set up bindings between actual version and WANT_AUTOCONF;
 # Start at last known unstable/stable versions to speed up lookup process.
 #
-if [ -z "${KNOWN_AUTOCONF}" ]; then
+if [ -z "${KNOWN_AUTOCONF}" ] ; then
 	KNOWN_AUTOCONF="2.70_beta2:2.5 2.69:2.5"
 fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
-- 
cgit v1.2.3-65-gdbad


From 03122e5ed9fb4e78a5daf10cff101bd783dd24b3 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 3 Nov 2020 19:31:43 +0100
Subject: sys-devel/autoconf-wrapper: Bump to version 14_pre2. Removed old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 ac-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 80cffcd..b414cf3 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -79,7 +79,7 @@ fi
 # Start at last known unstable/stable versions to speed up lookup process.
 #
 if [ -z "${KNOWN_AUTOCONF}" ] ; then
-	KNOWN_AUTOCONF="2.70_beta2:2.5 2.69:2.5"
+	KNOWN_AUTOCONF="2.70_beta3:2.5 2.69:2.5"
 fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
-- 
cgit v1.2.3-65-gdbad


From f51787459d9ea744351718ada8a688d6db85c04b Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 1 Dec 2020 18:18:19 +0100
Subject: sys-devel/autoconf-wrapper: Bump to version 14_pre3. Removed old

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 ac-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index b414cf3..177d2c6 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -79,7 +79,7 @@ fi
 # Start at last known unstable/stable versions to speed up lookup process.
 #
 if [ -z "${KNOWN_AUTOCONF}" ] ; then
-	KNOWN_AUTOCONF="2.70_beta3:2.5 2.69:2.5"
+	KNOWN_AUTOCONF="2.70_beta4:2.5 2.69:2.5"
 fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
-- 
cgit v1.2.3-65-gdbad


From 06b363662821d2a2e0640db47304cbef4d6ec247 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Wed, 9 Dec 2020 14:55:47 +0100
Subject: sys-devel/autoconf-wrapper: Bump to version 14. Removed old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 ac-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 177d2c6..b3e72c8 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -79,7 +79,7 @@ fi
 # Start at last known unstable/stable versions to speed up lookup process.
 #
 if [ -z "${KNOWN_AUTOCONF}" ] ; then
-	KNOWN_AUTOCONF="2.70_beta4:2.5 2.69:2.5"
+	KNOWN_AUTOCONF="2.70:2.5 2.69:2.5"
 fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
-- 
cgit v1.2.3-65-gdbad


From f97dc9283083f9dc45414e761406d818ffe12a74 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 29 Jan 2021 00:42:11 +0100
Subject: sys-devel/autoconf-wrapper: Bump to version 15

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 ac-wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index b3e72c8..e5eda0e 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
@@ -79,7 +79,7 @@ fi
 # Start at last known unstable/stable versions to speed up lookup process.
 #
 if [ -z "${KNOWN_AUTOCONF}" ] ; then
-	KNOWN_AUTOCONF="2.70:2.5 2.69:2.5"
+	KNOWN_AUTOCONF="2.71:2.5 2.70:2.5 2.69:2.5"
 fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
-- 
cgit v1.2.3-65-gdbad