* automake.in (&handle_gettext): Simplify redundant `if'.

Used &variable_value, don't read %contents directly.

diff --git a/ChangeLog b/ChangeLog
index 411e25f0e03c5b05139d0d9c7f808761fa8da071..741cf8b64fefab9b370af42e6d18c439465ebc5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-25  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&handle_gettext): Simplify redundant `if'.
+       Used &variable_value, don't read %contents directly.
+
 2001-02-25  Akim Demaille  <akim@epita.fr>
 
        * automake.in ($install_recursive): Remove, replaced with calls to

diff --git a/automake.in b/automake.in
index f6ff512257f0102d8da6c54db19bc49678b86e2b..a567f8ac0766c5a2e111225ed5a305a0605d6d83 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3466,21 +3466,15 @@ 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 &variable_value ('SUBDIRS') !~ /\bpo\b/;
+    &am_line_error ('SUBDIRS',
+                   "AM_GNU_GETTEXT used but \`intl' not in SUBDIRS")
+      if &variable_value ('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.
     if ($seen_linguas)