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

diff --git a/AutoGen.pm b/AutoGen.pm
index af3ffe1..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";
@@ -173,7 +173,7 @@ my($class,%args)=@_;
 			));
 	_system "make dist-tarZ" if $Options{"dist-tarZ"};
 	_move _rpmeval("_srcrpmdir")."/$name-*.src.rpm",".";
-	_move _rpmeval("_rpmdir")."/"._rpmeval("_arch")."/$name-*."._rpmeval("_arch").".rpm",".";
+	_move _rpmeval("_rpmdir")."/"._rpmeval("_target_cpu")."/$name-*."._rpmeval("_target_cpu").".rpm",".";
   _system "ls -l $name-*";
 	exit 0;	# should never return
 }
@@ -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
@@ -376,6 +378,8 @@ my($class,%options)=@_;
 	my $configure_in=_readfile("configure.in");
 	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GNU_GETTEXT\b/m; }
 			for (\$Options{"want-gettextize"});
+	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GLIB_GNU_GETTEXT\b/m; }
+			for (\$Options{"want-glib-gettextize"});
 	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_PROG_LIBTOOL\b/m; }
 			for (\$Options{"want-libtoolize"}); 
 	do { $$_=1 if !defined($$_) && $configure_in=~/^A[CM]_CONFIG_HEADER\b/m; }
@@ -427,6 +431,11 @@ my($class,%options)=@_;
 			_writefile $Makefile_in_in,$file;
 			}
 		}
+	if ($Options{"want-glib-gettextize"}) {
+		_system "glib-gettextize",@copy_arg;
+		# "po/ChangeLog" is somehow missing at this point
+		File::Touch->new("atime_only"=>1)->touch("po/ChangeLog");
+		}
 	_system "aclocal",map((!$_ ? () : @$_),$Options{"aclocal_args"});
 	_system qw(libtoolize),@copy_arg if $Options{"want-libtoolize"};
 	_system qw(autoheader) if $Options{"want-autoheader"};
@@ -445,7 +454,7 @@ my($class,%options)=@_;
 	$ENV{"CFLAGS"}||="";
 	# shared/static switching cannot be based on maintainer-mode in configure
 	_system(qw(./configure --enable-maintainer-mode),
-			($Options{"want-libtoolize"} && qw(--enable-shared --disable-static)),
+			(!$Options{"want-libtoolize"} ? () : qw(--enable-shared --disable-static)),
 			map((!$_ ? () : @$_),$Options{"configure_args"}),
 			);
 }