am-wrapper.diff

am-wrapper.diff (text/plain), 1.69 KB, created by Carsten Lohrke (RETIRED) on 2004-09-09 04:48:17 UTC

--- am-wrapper.pl-1.8-v2	2004-09-07 11:07:20.000000000 +0200
+++ am-wrapper.pl-1.9	2004-09-09 13:30:08.000000000 +0200
@@ -78,6 +78,7 @@
 my $binary_1_6  = "$0-1.6x";
 my $binary_1_7  = "$0-1.7x";
 my $binary_1_8  = "$0-1.8x";
+my $binary_1_9  = "$0-1.9x";
 
 # Automake is really getting out of hand, so rather start supporting
 # WANT_AUTOMAKE = "1.7" the like.  Unfortunately it override the old
@@ -97,7 +98,14 @@
 # 1.5, and then stay with it for a bit (those 1.4 die hards ..), only have
 # the 'configure.ac' test for 1.5 ...
 if ($ENV{WANT_AUTOMAKE} ne '1.4') {
-	if (-x $binary_1_8              # user may not have _1_8 ...
+	if (-x $binary_1_9              # user may not have _1_9 ...
+	&& (($ENV{WANT_AUTOMAKE} eq '1.9')
+	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.9'
+	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.9'
+	    || am_version('aclocal.m4') ge '1.9')) {
+	$ENV{WANT_AUTOMAKE} = '1.9';    # to prevent further "cats" and to enhance consistency (possible cwd etc)
+	$binary         = $binary_1_9;
+	} elsif (-x $binary_1_8              # user may not have _1_8 ...
 	&& (($ENV{WANT_AUTOMAKE} eq '1.8')
 	    || (cat_('Makefile.in') =~ /^# Makefile\.in generated by automake (\S+)/ ? $1 : '') ge '1.8'
 	    || (cat_('aclocal.m4') =~ /^# aclocal.m4 generated automatically by aclocal (\S+)/ ? $1 : '') ge '1.8'
@@ -137,8 +145,8 @@
 	if (-r 'configure.in' || -r 'configure.ac') {
 		$ENV{WANT_AUTOMAKE} = '1.4';    # for further consistency
 	} else {
-		$ENV{WANT_AUTOMAKE} = '1.8';
-		$binary         = $binary_1_8;
+		$ENV{WANT_AUTOMAKE} = '1.9';
+		$binary         = $binary_1_9;
 	}
     }
 }