* bin/autoreconf.in (&study_gettextize): New.

(&autoreconf): Handle newest gettextize.
Rerun aclocal if needed.
Suggested by Andreas Schwab.

diff --git a/ChangeLog b/ChangeLog
index 85914c88f9b25f6b67a255f01c949a792bc1431e..68e12b55a3c7b169d9e51d7caa6b08a00c99e108 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-14  Akim Demaille  <akim@epita.fr>
+
+       * bin/autoreconf.in (&study_gettextize): New.
+       (&autoreconf): Handle newest gettextize.
+       Rerun aclocal if needed.
+       Suggested by Andreas Schwab.
+
 2002-03-13  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi (Special Shell Variables): More about IFS.

diff --git a/NEWS b/NEWS
index 05733bb739fe00325a96b5a6986801788c307584..dd590ff257b750e09af6392541be6c80a86eb859 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
 * Major changes in Autoconf 2.53a                       -*- outline -*-
+
+** Executables
+
+- autoreconf is adjusted to GNU Gettext 0.11.
+
 \f
 * Major changes in Autoconf 2.53
 

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 9f378a439c57375b530965991a1a0ea28b21f550..b4905cc67053432e51de15cf7f177db3d95764fa 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -91,6 +91,9 @@ my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
 my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
 my $gettextize = $ENV{'GETTEXTIZE'} || 'gettextize';
 
+# Does gettextize support --no-changelog and --intl?
+my $gettextize_intl_p;
+my $gettextize_no_changelog_p;
 
 # --install -- as --add-missing in other tools.
 my $install = 0;
@@ -102,6 +105,8 @@ my $symlink = 0;
 # The directory where autoreconf was run.
 my $cwd = cwd;
 
+
+
 ## ---------- ##
 ## Routines.  ##
 ## ---------- ##
@@ -179,6 +184,29 @@ sub parse_args ()
 }
 
 
+# &study_gettextize
+# -----------------
+# See what options gettextize supports.
+sub study_gettextize ()
+{
+  return
+    if defined $gettextize_no_changelog_p && defined $gettextize_intl_p;
+
+  $gettextize_no_changelog_p = 0;
+  $gettextize_intl_p = 0;
+
+  my $usage = new Autom4te::XFile ("$gettextize --help |");
+  while ($_ = $usage->getline)
+    {
+      $gettextize_no_changelog_p = 1 if /--no-changelog/;
+      $gettextize_intl_p = 1         if /--intl/;
+    }
+
+  $gettextize .= " --no-changelog" if $gettextize_no_changelog_p;
+}
+
+
+
 # &autoreconf ($DIRECTORY)
 # ------------------------
 # Reconf the $DIRECTORY.
@@ -266,6 +294,9 @@ sub autoreconf ($)
        if -f 'aclocal.m4t';
     }
 
+  # We might have to rerun aclocal if Libtool or Gettext import new
+  # macros.
+  my $rerun_alocal = 0;
 
 
   # ------------------------------- #
@@ -276,6 +307,8 @@ sub autoreconf ($)
   # between two --trace, that's useless.  If there is no AC_INIT, then
   # we are not interested: it looks like a Cygnus thingy.
   my $uses_gettext;
+  # Starting at GNU Gettext 0.11, libintl is optional.
+  my $uses_libintl;
   my $uses_libtool;
   my $uses_autoheader;
   my @subdir;
@@ -289,7 +322,11 @@ sub autoreconf ($)
   while ($_ = $traces->getline)
     {
       $uses_autoconf = 1            if /AC_INIT/;
-      $uses_gettext = 1             if /AM_GNU_GETTEXT/;
+      if (/AM_GNU_GETTEXT/)
+       {
+         $uses_gettext = 1;
+         $uses_libintl = !/external/;
+       }
       $uses_libtool = 1             if /AC_PROG_LIBTOOL/;
       $uses_autoheader = 1          if /AC_CONFIG_HEADERS/;
       push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/;
@@ -319,17 +356,54 @@ sub autoreconf ($)
     {
       verbose "$configure_ac: not using Gettext";
     }
-  elsif (-d 'intl' && !$force)
-    {
-      verbose "$configure_ac: not running gettextize: `intl' is already present";
-    }
-  elsif ($install)
+  elsif (!$install)
     {
-      xsystem ($gettextize);
+      verbose "$configure_ac: not running gettextize: --install not given";
     }
   else
     {
-      verbose "$configure_ac: not running gettextize: --install not given";
+      # See if gettextize supports --intl and --no-changelog.
+      study_gettextize;
+
+      # Old and new gettext are really different :(
+      if ($gettextize_intl_p)
+       {
+         # Gettext >= 0.11.
+         if ($uses_libintl)
+           {
+             if (-d 'intl' && !$force)
+               {
+                 verbose ("$configure_ac: not running gettextize: ",
+                          "`intl' is already present");
+               }
+             else
+               {
+                 xsystem "$gettextize --intl";
+                 $rerun_alocal = 1;
+               }
+           }
+         else
+           {
+             # Always run modern gettextizes, as they update/import
+             # several files.
+             xsystem "$gettextize";
+             $rerun_alocal = 1;
+           }
+       }
+      else
+       {
+         # Gettext < 0.11.
+         if (-d 'intl' && !$force)
+           {
+             verbose ("$configure_ac: not running gettextize: ",
+                      "`intl' is already present");
+           }
+         else
+           {
+             xsystem "$gettextize --intl";
+             $rerun_alocal = 1;
+           }
+       }
     }
 
 
@@ -344,6 +418,7 @@ sub autoreconf ($)
   elsif ($install)
     {
       xsystem ($libtoolize);
+      $rerun_alocal = 1;
     }
   else
     {
@@ -369,6 +444,27 @@ sub autoreconf ($)
     }
 
 
+  # ------------------- #
+  # Rerunning aclocal.  #
+  # ------------------- #
+
+  # If we re-installed Libtool or Gettext, the macros might have changed.
+  if ($rerun_alocal)
+    {
+      if (!$uses_aclocal)
+       {
+         verbose "$configure_ac: not using aclocal";
+       }
+      else
+       {
+         xsystem ("$aclocal $aclocal_flags --output=aclocal.m4t");
+         # aclocal may produce no output.
+         update_file ('aclocal.m4t', 'aclocal.m4')
+           if -f 'aclocal.m4t';
+       }
+    }
+
+
   # ------------------ #
   # Running autoconf.  #
   # ------------------ #