From 0cada45b3ec4bd1af4a577fc89a4d77e354288c3 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 26 Feb 2001 01:10:32 +0000
Subject: [PATCH] 	* tests/Makefile.am (TESTS): Added subdircond.test. 
 * tests/subdircond.test: New file. 	* automake.in (handle_gettext): Don't
 fail if SUBDIRS 	conditionally defined.

---
 ChangeLog             |  5 +++++
 automake.in           |  6 ++++--
 tests/Makefile.am     |  1 +
 tests/Makefile.in     | 31 ++++++++++++++++---------------
 tests/subdircond.test | 24 ++++++++++++++++++++++++
 5 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100755 tests/subdircond.test

diff --git a/ChangeLog b/ChangeLog
index b81f044e..6f6995e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-02-25  Tom Tromey  <tromey@redhat.com>
 
+	* tests/Makefile.am (TESTS): Added subdircond.test.
+	* tests/subdircond.test: New file.
+	* automake.in (handle_gettext): Don't fail if SUBDIRS
+	conditionally defined.
+
 	* automake.in: Use IO::File.
 	(generate_makefile): Use IO::File.
 	(scan_texinfo_file): Likewise.
diff --git a/automake.in b/automake.in
index 4cc55dff..84fe295d 100755
--- a/automake.in
+++ b/automake.in
@@ -3463,12 +3463,14 @@ sub handle_gettext
 	    ("AM_GNU_GETTEXT used but SUBDIRS not defined");
 	return;
     }
+
+    my @subdirs = &variable_value_as_list ('SUBDIRS', 'all');
     &am_line_error ('SUBDIRS',
 		    "AM_GNU_GETTEXT used but \`po' not in SUBDIRS")
-      if &variable_value ('SUBDIRS') !~ /\bpo\b/;
+	if ! grep ('po', @subdirs);
     &am_line_error ('SUBDIRS',
 		    "AM_GNU_GETTEXT used but \`intl' not in SUBDIRS")
-      if &variable_value ('SUBDIRS') !~ /\bintl\b/;
+	if ! grep ('intl', @subdirs);
 
     &require_file_with_conf_line ($ac_gettext_line, $GNU, 'ABOUT-NLS');
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 09095208..c2a270d9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -237,6 +237,7 @@ subdir2.test \
 subdir3.test \
 subdir4.test \
 subdirbuiltsources.test \
+subdircond.test \
 subobj.test \
 subobj2.test \
 subobj3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index cf0a25b1..fcba2c97 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -314,6 +314,7 @@ subdir2.test \
 subdir3.test \
 subdir4.test \
 subdirbuiltsources.test \
+subdircond.test \
 subobj.test \
 subobj2.test \
 subobj3.test \
@@ -481,34 +482,34 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-.PHONY: all all-am check check-TESTS check-am clean clean-generic \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic uninstall uninstall-am
+clean: clean-am
 
-install-man:
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
 
-clean-am: clean-generic mostlyclean-am
-
-install-exec-am:
+distclean-am: clean-am distclean-generic distclean-local
 
 install-data-am:
 
-distclean-am: clean-am distclean-generic distclean-local
+install-exec-am:
+
+install-man:
 
 maintainer-clean: maintainer-clean-am
 
-mostlyclean-am: mostlyclean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-clean: clean-am
+mostlyclean-am: mostlyclean-generic
+
+.PHONY: all all-am check check-TESTS check-am clean clean-generic \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am
 
 
 distclean-local:
diff --git a/tests/subdircond.test b/tests/subdircond.test
new file mode 100755
index 00000000..25bb5e84
--- /dev/null
+++ b/tests/subdircond.test
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# It is ok to have a conditional SUBDIRS when using gettext.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AM_GNU_GETTEXT
+AM_CONDITIONAL(MAUDE, true)
+ALL_LINGUAS=
+AC_SUBST(ALL_LINGUAS)
+END
+
+mkdir po intl
+
+cat > Makefile.am << 'END'
+if MAUDE
+SUBDIRS = po intl
+else
+SUBDIRS =
+endif
+END
+
+$AUTOMAKE
-- 
2.43.5