gettext fixlet

diff --git a/ChangeLog b/ChangeLog
index 8035d01241137becf92036204d34df8dddfadfd6..eeec7bfbea39c2a49a47d6c28c9b3d8fe3dbb1d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Oct 10 16:12:38 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_gettext): Moved check for SUBDIRS and
+       ABOUT-NLS here.
+
        * automake.in (handle_configure): Run mkinstalldirs under
        $(SHELL).
        (handle_yacc_lex_cxx): Run interlock under $(SHELL).

diff --git a/THANKS b/THANKS
index 3aeb619f9d212fa42fbf914636e694c7effa2d87..e8a3301333974462a79f1be3b9be095783a21a82 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -26,6 +26,7 @@ Mark Galassi <rosalia@nis.lanl.gov>
 Markku Rossi <mtr@ngs.fi>
 Noah Friedman <friedman@gnu.ai.mit.edu>
 Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
+Per Bothner <bothner@cygnus.com>
 Steve M. Robbins <steve@nyongwa.montreal.qc.ca>
 Thomas Morgan <tmorgan@pobox.com>
 Tom Tromey <tromey@cygnus.com>

diff --git a/automake.in b/automake.in
index 586534edb451c014e1303e24d45ce4e0932c2d48..81cf79da670f8dd49c9788a3f3a279dbde8e9a80 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1917,17 +1917,6 @@ sub handle_dependencies
 # Handle subdirectories.
 sub handle_subdirs
 {
-    if (! &variable_defined ('SUBDIRS'))
-    {
-       &am_conf_error
-           ("ud_GNU_GETTEXT in configure.in but SUBDIRS not defined")
-               if $seen_gettext && $relative_dir eq '.';
-       return;
-    }
-
-    &require_file_with_conf_line ($ac_gettext_line, $FOREIGN, 'ABOUT-NLS')
-       if $seen_gettext;
-
     return if ! &variable_defined ('SUBDIRS');
 
     # Make sure each directory mentioned in SUBDIRS actually exists.
@@ -2154,6 +2143,16 @@ sub handle_gettext
 {
     return if ! $seen_gettext || $relative_dir ne '.';
 
+    if (! &variable_defined ('SUBDIRS'))
+    {
+       &am_conf_error
+           ("ud_GNU_GETTEXT in configure.in but SUBDIRS not defined");
+       return;
+    }
+
+    &require_file_with_conf_line ($ac_gettext_line, $FOREIGN, 'ABOUT-NLS')
+       if $seen_gettext;
+
     if (&variable_defined ('SUBDIRS'))
     {
        &am_line_error