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.
("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');
subdir3.test \
subdir4.test \
subdirbuiltsources.test \
+subdircond.test \
subobj.test \
subobj2.test \
subobj3.test \
@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:
--- /dev/null
+#! /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