* tests/Makefile.am (TESTS): Added subdircond.test.

	* tests/subdircond.test: New file.
	* automake.in (handle_gettext): Don't fail if SUBDIRS
	conditionally defined.

diff --git a/ChangeLog b/ChangeLog
index b81f044ee4712bed66c6ae9408ca6825e273c103..6f6995e7eff819f805f265d468894b199db4e3ac 100644 (file)
--- 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 4cc55dff156c1c12f67d00b636e2a86f75c7ade5..84fe295d630a1e28faa447c4e2c797f6694fc42d 100755 (executable)
--- 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 09095208610aa986dc8d174dcc4681fd46526ac0..c2a270d94b4157ff8060e79f7cdfee8c720ff574 100644 (file)
--- 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 cf0a25b12f42f210f568fcaa7a0b5c6b54534e64..fcba2c97b4cf8e137cc2a8378d7b4fde3fb70210 100644 (file)
--- 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 (executable)
index 0000000..25bb5e8
--- /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