diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-03-09 16:46:20 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-03-09 16:46:20 +0000 |
| commit | 40adc550c73fe1c997f993c911b4fa3123943938 (patch) | |
| tree | 1bc165b3961c0b130e8d9dd5f916d51495532d6e | |
| parent | autom4te tweak (diff) | |
| download | autotools-wrappers-40adc550c73fe1c997f993c911b4fa3123943938.tar.gz autotools-wrappers-40adc550c73fe1c997f993c911b4fa3123943938.tar.bz2 autotools-wrappers-40adc550c73fe1c997f993c911b4fa3123943938.zip | |
update ac-wrapper.pl to work with AC_PREREQ in []
Some new stuff have AC_PREREQ in [].
| -rwxr-xr-x | ac-wrapper.pl | 4 |
1 files 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 { |