X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=cad8cbfc45a4ebf57580cbb919cb44bb713c0221;hp=45f6d7e34fb4a7b3fe297105509863e0b845e177;hb=6c5a7edbfb5b833d42f0b9c4c4844ca366f32025;hpb=b2f7664779840eca0c314a4cd035e6af7c500bf9

diff --git a/AutoGen.pm b/AutoGen.pm
index 45f6d7e..cad8cbf 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -39,7 +39,7 @@ BEGIN {
 		use File::Touch;	# &touch
 		use POSIX qw(WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG WIFSTOPPED WSTOPSIG);
 HERE
-		eval "$_\n; 1;" or push @missing,(/^\s*use\s+([^\s;]+)/)[0];
+		eval "$_\n; 1;" or push @missing,(/^\s*use\s+([^ ;]+)/)[0];
 		}
 	die "You are missing some modules - install them by:\n"
 					."\tperl -MCPAN -e 'install qw(".join(" ",@missing).")'\n"
@@ -63,6 +63,23 @@ Supported parameters:
 '.($Options{"help"} || "");
 }
 
+sub checkcommandversion
+{
+my($class,$command,$version)=@_;
+
+	local *F;
+	do { open F,$_ or confess "Open $_: $!"; } for ("$command --version|");
+	local $/;
+	undef $/;
+	my $command_out=<F>;
+	close F;
+	my $command_version=($command_out=~m#([\d.]+)#)[0];
+	confess "$command(1) version not found in its output" if !$command_version;
+	confess "'$command' version $version or higher required"
+			# Do not take 3rd+ numbers as it would not be a number
+			if ($command_version=~/^(\d+[.]\d+)/)[0]<$version;
+}
+
 sub _readfile
 {
 my($filename)=@_;
@@ -120,6 +137,8 @@ my(@files)=@_;
 
 	my $nocheck=shift @files if $files[0] eq "nocheck";
 	my $dest=pop @files;
+	# expand pattern to properly match &copy resulting filenames count
+	@files=map({ glob $_; } @files);
 	@files==copy @files,$dest or $nocheck or confess "$!";
 }
 
@@ -130,6 +149,8 @@ my(@files)=@_;
 
 	my $nocheck=shift @files if $files[0] eq "nocheck";
 	my $flag=shift @files if ref $files[0];
+	# expand pattern to properly match &remove resulting filenames count
+	@files=map({ glob $_; } @files);
 	@files==remove((!$flag ? () : $flag),@files) or $nocheck or confess "$!";
 }