Cosmetic: Fixed warning if !want-libtoolize

[macros.git] / AutoGen.pm

diff --git a/AutoGen.pm b/AutoGen.pm
index ec5c50e..4d7428f 100644 (file)
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -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
 }
@@ -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,7 @@ my($class,%options)=@_;
                        _writefile $Makefile_in_in,$file;
                        }
                }
+       _system "glib-gettextize",@copy_arg if $Options{"want-glib-gettextize"};
        _system "aclocal",map((!$_ ? () : @$_),$Options{"aclocal_args"});
        _system qw(libtoolize),@copy_arg if $Options{"want-libtoolize"};
        _system qw(autoheader) if $Options{"want-autoheader"};
@@ -440,9 +443,12 @@ my($class,%options)=@_;
 
        return if $Options{"ARGV_dist"};
 
+       # 'configure' defaults to CFLAGS '-g -O2' but our --enable-maintainer-mode
+       # should force '-ggdb3'
+       $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"}),
                        );
 }