[patch] fix to evalutate all AC_PRERQ macro calls

ac-wrapper-2.pl.diff (text/plain), 1.09 KB, created by jochen on 2004-02-12 09:18:58 UTC

--- ac-wrapper-2.pl	2003-11-08 00:47:20.000000000 +0100
+++ /usr/lib/autoconf/ac-wrapper.pl	2004-02-12 18:02:21.000000000 +0100
@@ -54,10 +54,10 @@
 	|| (-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' 
+	   	    || ((@versions = cat_('configure.in') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/mg) ? ((sort @versions)[-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'))) {
+	        || ((@versions = cat_('aclocal.m4') =~ /^\s*\[?AC_PREREQ\(\[?([^\)]{3})[^\)]*\]?\)/mg) ? ((sort @versions)[-1]) : '') gt '2.1'))) {
 	$ENV{WANT_AUTOCONF} = '2.5';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
 	$binary 	    = $binary_new;
     } else {