diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-02-20 00:12:27 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-02-20 00:12:27 +0000 |
| commit | 10c036ae4c1f6e5c5575d364ef5977d84f33ac98 (patch) | |
| tree | 9ab0bb3bcc23fd77ed27f8e5755e8f5f44fc12d6 | |
| parent | new version (diff) | |
| download | autotools-wrappers-10c036ae4c1f6e5c5575d364ef5977d84f33ac98.tar.gz autotools-wrappers-10c036ae4c1f6e5c5575d364ef5977d84f33ac98.tar.bz2 autotools-wrappers-10c036ae4c1f6e5c5575d364ef5977d84f33ac98.zip | |
autom4te tweak
Run autom4te-2.5x if called without setting WANT_AUTOMAKE_2_5=1 ...
| -rwxr-xr-x | ac-wrapper.pl | 15 |
1 files 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 { |