X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=de75b419d98419d26ac0b307370bbff076711b1a;hp=aa4bb647bc1fbfac7c81eb70bb6da10d265cb2a5;hb=0bd38062103d7233de8f542842a26f2b9635a3e3;hpb=6cf1604c42c41f1b95fae2d07e3b4725a1f99f90

diff --git a/AutoGen.pm b/AutoGen.pm
index aa4bb64..de75b41 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -336,7 +336,7 @@ sub _cleanfiles
 						./mkinstalldirs
 						./libtool ./ltconfig ./ltmain.sh
 						./ABOUT-NLS
-						./<name>-[0-9]* ./<name>-devel-[0-9]*
+						./<name>-[0-9]* ./<name>-*-[0-9]*
 						./<name>.spec ./<name>.m4 ./<name>.spec.m4
 						./debian/tmp ./debian/<name>
 						./<name>*_[0-9]*
@@ -496,14 +496,18 @@ my($class,%options)=@_;
 	return if $Options{"ARGV_clean"} || $Options{"ARGV_fullclean"};
 
 	$Options{"aclocal_args"}=[qw(-I macros),map((!$_ ? () : @$_),$Options{"aclocal_args"})];
-	my $configure_in=_readfile("configure.in");
-	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GNU_GETTEXT\b/m; }
+	my $configure_name;
+	do { $configure_name||=$_ if -f $_ } for ("configure.in");
+	do { $configure_name||=$_ if -f $_ } for ("configure.ac");
+	$configure_name or confess "Cannot find configure.{in,ac}";
+	my $configure_in=_readfile($configure_name);
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_GNU_GETTEXT\b/m; }
 			for (\$Options{"want-gettextize"});
-	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GLIB_GNU_GETTEXT\b/m; }
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_GLIB_GNU_GETTEXT\b/m; }
 			for (\$Options{"want-glib-gettextize"});
-	do { $$_=1 if !defined($$_) && $configure_in=~/^AM_PROG_LIBTOOL\b/m; }
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_PROG_LIBTOOL\b/m; }
 			for (\$Options{"want-libtoolize"}); 
-	do { $$_=1 if !defined($$_) && $configure_in=~/^A[CM]_CONFIG_HEADER\b/m; }
+	do { $$_=1 if !defined($$_) && $configure_in=~/^\s*A[CM]_CONFIG_HEADER\b/m; }
 			for (\$Options{"want-autoheader"});
 	my @copy_arg=(!$Options{"ARGV_copy"} ? () : "--copy");
 
@@ -517,7 +521,7 @@ my($class,%options)=@_;
 				."'") {
 			_system $_ and confess $_;
 			}
-		for ("configure.in","Makefile.am") {
+		for ($configure_name,"Makefile.am") {
 			STDERR->printflush("gettextize recovery rename \"$_~\"->\"$_\"... ");
 			rename "$_~","$_" or confess "$!";
 			STDERR->printflush("ok\n");