'_cleanfiles' update for automake-1.7.5-1

[macros.git] / AutoGen.pm

diff --git a/AutoGen.pm b/AutoGen.pm
index 3294492..1fad581 100644 (file)
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -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
@@ -376,6 +376,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 +429,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 +452,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"}),
                        );
 }