From: Bruno Haible <bruno@clisp.org>
Date: Mon, 3 Mar 2003 18:53:40 +0000 (+0000)
Subject: Fix the --help output of the toplevel configure.
X-Git-Tag: v0.12~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fe0ffb294a39802c32016060cda4b2beed4a6a3;p=thirdparty%2Fgettext.git

Fix the --help output of the toplevel configure.
---

diff --git a/ChangeLog b/ChangeLog
index 03167ef94..3831e262a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-27  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: Include AC_CANONICAL_HOST, AC_ARG_ENABLE, AC_ARG_WITH,
+	AC_ARG_VAR calls from the subdir configures.
+	* Makefile.am (configure): Depend on each subdir's configure.ac.
+
 2003-02-22  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (ps, pdf): Remove rules, redundant with automake 1.7.2.
diff --git a/Makefile.am b/Makefile.am
index ba0f44f10..22367901f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,9 @@ EXTRA_DIST = \
   config/m4/fixautomake.m4 \
   config/m4/libtool.m4
 
+# Additional dependencies for configure, due to the use of autoconf --trace.
+$(srcdir)/configure: $(srcdir)/autoconf-lib-link/configure.ac $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-tools/configure.ac 
+
 
 # DJGPP port.
 
diff --git a/configure.ac b/configure.ac
index b189e52f2..f1d220dfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,18 @@ dnl Checks for library functions.
 
 AC_CONFIG_SUBDIRS(autoconf-lib-link gettext-runtime gettext-tools)
 
+dnl Ensure that "configure --help" lists all the command line options that
+dnl are usable with the subdir configures. Really AC_CONFIG_SUBDIRS should
+dnl do it by itself.
+dnl System types:
+AC_CANONICAL_HOST
+dnl Optional Features: AC_ARG_ENABLE calls
+dnl Optional Packages: AC_ARG_WITH calls
+dnl Some influential environment variables: AC_ARG_VAR calls
+esyscmd([cd autoconf-lib-link && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)'])
+esyscmd([cd gettext-runtime   && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)'])
+esyscmd([cd gettext-tools     && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)'])
+
 AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT