From: Akim Demaille <akim@epita.fr>
Date: Sun, 25 Feb 2001 18:47:53 +0000 (+0000)
Subject: * automake.in (&handle_gettext): Simplify redundant `if'.
X-Git-Tag: handle-languages~244
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=f55834fbeb8ae24cc6b0b1b52c2ce6d4c6422f90;p=automake.git

* automake.in (&handle_gettext): Simplify redundant `if'.
Used &variable_value, don't read %contents directly.
---

diff --git a/ChangeLog b/ChangeLog
index 411e25f0..741cf8b6 100644
--- 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 f6ff5122..a567f8ac 100755
--- 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)