diff --git a/autoconf/bin/autoreconf.in b/autoconf/bin/autoreconf.in index 2859cff..1a58761 100755 --- a/autoconf/bin/autoreconf.in +++ b/autoconf/bin/autoreconf.in @@ -58,7 +58,7 @@ use strict; $help = "Usage: $0 [OPTION] ... [CONFIGURE-AC or DIRECTORY] ... Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' -(formerly `gettextize'), and `libtoolize' where appropriate) +(formerly `gettextize'), `libtoolize', and `intltoolize' where appropriate) repeatedly to remake the GNU Build System files in the DIRECTORIES or the directory trees driven by CONFIGURE-AC (defaulting to `.'). @@ -110,6 +110,7 @@ my $automake = $ENV{'AUTOMAKE'} || 'automake'; my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; +my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize'; # --install -- as --add-missing in other tools. my $install = 0; @@ -164,7 +165,7 @@ sub parse_args () for my $prog ($autoconf, $autoheader, $automake, $aclocal, $autopoint, - $libtoolize) + $libtoolize, $intltoolize) { xsystem ("$prog --version | sed 1q >&2"); print STDERR "\n"; @@ -186,6 +187,7 @@ sub parse_args () $automake .= ' --add-missing'; $automake .= ' --copy' unless $symlink; $libtoolize .= ' --copy' unless $symlink; + $intltoolize .= ' --copy' unless $symlink; } # --force; if ($force) @@ -197,6 +199,7 @@ sub parse_args () $automake .= ' --force-missing'; $autopoint .= ' --force'; $libtoolize .= ' --force'; + $intltoolize .= ' --force'; } else { @@ -215,6 +218,7 @@ sub parse_args () $automake .= ' --verbose'; $aclocal .= ' --verbose'; $libtoolize .= ' --debug'; + $intltoolize .= ' --debug'; } # --warnings; if (@warning) @@ -427,6 +431,7 @@ sub autoreconf_current_directory () my $uses_gettext_via_traces; my $uses_libtool; my $uses_autoheader; + my $uses_intltool; my @subdir; verb "$configure_ac: tracing"; my $traces = new Autom4te::XFile @@ -440,6 +445,7 @@ sub autoreconf_current_directory () 'AC_INIT', 'AC_PROG_LIBTOOL', 'AM_GNU_GETTEXT', + 'IT_PROG_INTLTOOL', ) . ' |'); while ($_ = $traces->getline) @@ -449,6 +455,7 @@ sub autoreconf_current_directory () $uses_gettext_via_traces = 1 if /AM_GNU_GETTEXT/; $uses_libtool = 1 if /AC_PROG_LIBTOOL/; $uses_autoheader = 1 if /AC_CONFIG_HEADERS/; + $uses_intltool = 1 if /IT_PROG_INTLTOOL/; push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/; } @@ -509,6 +516,24 @@ sub autoreconf_current_directory () verb "$configure_ac: not running libtoolize: --install not given"; } + # -------------------- # + # Running intltoolize. # + # -------------------- # + + if (!$uses_intltool) + { + verb "$configure_ac: not using Intltool"; + } + elsif ($install) + { + xsystem ($intltoolize); + $rerun_aclocal = 1; + } + else + { + verb "$configure_ac: not running intltoolize: --install not given"; + } + # ------------------- #