From 809e998aba83b8605be280b153543338c073a436 Mon Sep 17 00:00:00 2001 From: short <> Date: Sat, 30 Aug 2003 09:44:34 +0000 Subject: [PATCH] +Compatibility with "configure.ac" (not just "configure.in") name. --- AutoGen.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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"); -- 1.8.3.1