X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=95aa2e855c128cd1df744ba5a2862dc37e2e6d9d;hp=d5a156c76369d80de253eefcfce6fd1bb1b4eea9;hb=809e998aba83b8605be280b153543338c073a436;hpb=47245093e2a05c9596034336ad81fcbef0fd495b diff --git a/AutoGen.pm b/AutoGen.pm index d5a156c..95aa2e8 100644 --- a/AutoGen.pm +++ b/AutoGen.pm @@ -496,7 +496,11 @@ 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"); + 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=~/^AM_GNU_GETTEXT\b/m; } for (\$Options{"want-gettextize"}); do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GLIB_GNU_GETTEXT\b/m; } @@ -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");