Check for 'libtool' version 1.5 or higher instead of grepping its body

 - libtool-1.5 has been released today

diff --git a/autogen.pl b/autogen.pl
index 213f263..4d1d068 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -52,19 +52,15 @@ AutoGen->run(
                                ./src/libcaptive/sandbox/sandbox-skelimpl.c
                                )],
                "prep"=>sub {
+                               local *F;
+                               do { open F,$_ or confess "Open $_: $!"; } for ("libtoolize --version|");
                                local $/;
                                undef $/;
-                               local *F;
-                               do { open F,$_ or confess "Open $_: $!"; } for ("libtoolize -n|");
                                my $libtoolize_out=<F>;
                                close F;
-                               my $ltmain_sh_fn=($libtoolize_out=~m#\s(/\S*/\Qltmain.sh\E)\b#)[0];
-                               confess "'ltmain.sh' pathname not found in libtoolize(1) output" if !$ltmain_sh_fn;
-                               do { open F,$_ or confess "Open $_: $!"; } for ($ltmain_sh_fn);
-                               my $ltmain_sh_body=<F>;
-                               close F;
-                               $ltmain_sh_body=~/object name conflicts; renaming object files/
-                                               or confess "'libtool' package version 1.5 or higher required";
+                               my $libtoolize_version=($libtoolize_out=~m#([\d.]+)#)[0];
+                               confess "libtoolize(1) version not found in its output" if !$libtoolize_version;
+                               do { confess "'libtool' package version $_ or higher required" if $libtoolize_version<$_; } for (1.5);
                                1;
                                },
                );