From 40adc550c73fe1c997f993c911b4fa3123943938 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer 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