X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=blobdiff_plain;f=AutoGen.pm;h=4d7428f531bdc2d02d4c41f6f309e3ce516ada39;hp=3294492ab7f3a0a08600def70be1eaff3201af54;hb=02bad6751e0b4d5bb2f790baa332ad5ce92a05b9;hpb=a9661c9cf600fad523f3ecf5427e29e24cd2ea2e

diff --git a/AutoGen.pm b/AutoGen.pm
index 3294492..4d7428f 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -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"};
@@ -445,7 +448,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"}),
 			);
 }