X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=aa28398a2f200b321253a88f3e552c152a2221a7;hp=adbfc9b79b200d3fd658834e45896a9f24537d90;hb=f6f4d5b5dfa615753c7bdd3ac3b7e15cfd2c506f;hpb=a0b7a7025bcf73d7392a5c08d5d73da42e9026d3

diff --git a/AutoGen.pm b/AutoGen.pm
index adbfc9b..aa28398 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"
@@ -159,7 +159,7 @@ my($class,%args)=@_;
 	$spec=~s/\\\n/ /gs;
 	$class->run(%Options,
 			"ARGV"=>["--copy"],
-			"configure_args"=>[split /\s+/,($spec=~/^%configure\s+(.*)$/m)[0]],
+			"configure_args"=>[split /\s+/,($spec=~/^[%]configure\b[ \t]*(.*)$/m)[0]],
 			);
 	_remove "ChangeLog";	# force its rebuild by Makefile/rcs2log
 	_system "make dist $name.spec";
@@ -219,7 +219,7 @@ sub _cleanfiles
 						./stamp-h ./stamp-h.in ./stamp-h1
 						./install-sh
 						./aclocal.m4
-						./autom4te-*.cache
+						./autom4te.cache ./autom4te-*.cache
 						./m4
 						./missing
 						./mkinstalldirs
@@ -333,8 +333,10 @@ sub _expandclass
 my($patt)=@_;
 
 	return $patt if $patt!~/\Q[\E(.*?)\Q]\E/;
-	my($pre,$post)=($`,$');	# FIXME: local($`,$') doesn't work - why?
-	return map({ _expandclass("$pre$_$post"); } split("",$1));
+	my($pre,$range,$post)=($`,$1,$');	# FIXME: local($`,$1,$') doesn't work - why?
+	1 while $range=~s#(.)-(.)# join("",map(chr,(ord($1)..ord($2))));
+			#ge;
+	return map({ _expandclass("$pre$_$post"); } split("",$range));
 }
 
 sub run