64-simplify-handle-gettext.patch

[Akim Demaille]

FYI, here is the top of handle_gettext.

sub handle_gettext
{
    return if ! $seen_gettext || $relative_dir ne '.';

    if (! &variable_defined ('SUBDIRS'))
    {
        &am_conf_error
            ("AM_GNU_GETTEXT used but SUBDIRS not defined");
        return;
    }


Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&handle_gettext): Simplify redundant `if'.

Index: automake.in
--- automake.in Sat, 24 Feb 2001 14:51:56 +0100 akim (am/f/39_automake.i 1.71 
755)
+++ automake.in Sat, 24 Feb 2001 14:59:50 +0100 akim (am/f/39_automake.i 1.71 
755)
@@ -3433,20 +3433,14 @@ sub handle_gettext
            ("AM_GNU_GETTEXT used but SUBDIRS not defined");
        return;
     }
+    &am_line_error ('SUBDIRS',
+                   "AM_GNU_GETTEXT used but \`po' not in SUBDIRS")
+      if $contents{'SUBDIRS'} !~ /\bpo\b/;
+    &am_line_error ('SUBDIRS',
+                   "AM_GNU_GETTEXT used but \`intl' not in SUBDIRS")
+      if $contents{'SUBDIRS'} !~ /\bintl\b/;

     &require_file_with_conf_line ($ac_gettext_line, $GNU, 'ABOUT-NLS');
-
-    if (&variable_defined ('SUBDIRS'))
-    {
-       &am_line_error
-           ('SUBDIRS',
-            "AM_GNU_GETTEXT in \`$configure_ac' but \`po' not in SUBDIRS")
-               if $contents{'SUBDIRS'} !~ /\bpo\b/;
-       &am_line_error
-           ('SUBDIRS',
-            "AM_GNU_GETTEXT in \`$configure_ac' but \`intl' not in SUBDIRS")
-               if $contents{'SUBDIRS'} !~ /\bintl\b/;
-    }

     # Ensure that each language in ALL_LINGUAS has a .po file, and
     # each po file is mentioned in ALL_LINGUAS.