From: short <>
Date: Sat, 16 Aug 2003 07:47:26 +0000 (+0000)
Subject: libtoolize check now uses &AutoGen->checkcommandversion.
X-Git-Tag: bp_captive~55
X-Git-Url: http://git.jankratochvil.net/?a=commitdiff_plain;h=a89ed494c90ab62acfb750d2c8811faca57fe8f7;p=captive.git

libtoolize check now uses &AutoGen->checkcommandversion.
+automake version check for 1.6.
---

diff --git a/autogen.pl b/autogen.pl
index a95974a..c3e0edb 100755
--- a/autogen.pl
+++ b/autogen.pl
@@ -64,19 +64,11 @@ AutoGen->run(
 				./src/TraceFS/TraceFS-W32/buildfre.err
 				)],
 		"prep"=>sub {
-				local *F;
-				do { open F,$_ or confess "Open $_: $!"; } for ("libtoolize --version|");
-				local $/;
-				undef $/;
-				my $libtoolize_out=<F>;
-				close F;
-				my $libtoolize_version=($libtoolize_out=~m#([\d.]+)#)[0];
-				confess "libtoolize(1) version not found in its output" if !$libtoolize_version;
-				for (1.5) {
-						confess "'libtool' package version $_ or higher required"
-								# Do not take 3rd+ numbers as it would not be a number
-								if ($libtoolize_version=~/^(\d+[.]\d+)/)[0]<$_;
-						}
+				# For conflicting object basenames in convenient libraries:
+				AutoGen->checkcommandversion("libtoolize","1.5");
+				# 1.5 for AM_PROG_AS.
+				# 1.6 to prevent weird error wrt 'SANDBOX_IDL_SOURCES':
+				AutoGen->checkcommandversion("automake","1.6");
 				1;
 				},
 		);