Fix the --help output of the toplevel configure.

diff --git a/ChangeLog b/ChangeLog
index 03167ef94d86b44ef7dcdc6f3affaa8c94b6a14e..3831e262aab7e2ab1585d069701be7bf3b70a7de 100644 (file)
--- 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 ba0f44f10f29d031b16c4d0b9fa25899196418f1..22367901fcede9b806878bc425c96d2b3e9f4dfd 100644 (file)
--- 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 b189e52f2a3baa35e9611d277d729833635b366d..f1d220dfdeb9c2a1471c9f0b7651e48016ad13f9 100644 (file)
--- 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