From 87e87254fe0ce8913b862221b66668e5b1f44505 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Sun, 19 May 2002 18:15:43 +0000 Subject: new version New version. Thanks to Alexander Kelett for the initial version that contains all three major releases, and also am-wrapper.pl-1.6. Changes from his version: 1.5d has to have "-1.5d" as suffix, and not "-1.5", as this causes calls by aclocal to automake to fail, as they have multiversion support. Also fixed some other problems that was part of my first dual version. Added the sed to change the "-1.5x" in am-wrapper.pl-1.6 to "-1.5d". Anyway, should resolve bug 2803. --- am-wrapper.pl | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/am-wrapper.pl b/am-wrapper.pl index 3d71e75..4aa266c 100755 --- a/am-wrapper.pl +++ b/am-wrapper.pl @@ -17,28 +17,32 @@ # # - defaults to automake-1.4 # - runs automake-1.6x if it exists and... -# - envvar WANT_AUTOMAKE_1_6 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' +# - envvar WANT_AUTOMAKE_1_6 is set to `1' +# - runs automake-1.5x if it exists and... +# - envvar WANT_AUTOMAKE_1_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 = ; wantarray ? @l : join '', @l } -my $binary = "$0-1.4"; -my $binary_new = "$0-1.6x"; +my $binary = "$0-1.4"; +my $binary_new = "$0-1.5x"; +my $binary_vnew = "$0-1.6x"; if (!$ENV{WANT_AUTOMAKE_1_4}) { - if (-x $binary_new # user may have only 2.13 - && ($ENV{WANT_AUTOMAKE_1_6} + if (-x $binary_vnew # user may not have _1_6 + && ($ENV{WANT_AUTOMAKE_1_6}) ) { + $binary = $binary_vnew; + } elsif (-x $binary_new # user may have only 2.13 + && ($ENV{WANT_AUTOMAKE_1_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_AUTOMAKE_1_6} = 1; # to prevent further "cats" and to enhance consistency (possible cwd etc) + $ENV{WANT_AUTOMAKE_1_5} = 1; # to prevent further "cats" and to enhance consistency (possible cwd etc) $binary = $binary_new; } else { $ENV{WANT_AUTOMAKE_1_4} = 1; # for further consistency -- cgit v1.2.3-65-gdbad