summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2003-03-03 18:53:40 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:10:15 +0200
commit3fe0ffb294a39802c32016060cda4b2beed4a6a3 (patch)
tree20759de97979ebd0e3c7e25f9fd542cf6d3bfe5d
parent6a14da3ebd3e08524f49bd570b3ff66a64acdb7f (diff)
downloadexternal_gettext-3fe0ffb294a39802c32016060cda4b2beed4a6a3.zip
external_gettext-3fe0ffb294a39802c32016060cda4b2beed4a6a3.tar.gz
external_gettext-3fe0ffb294a39802c32016060cda4b2beed4a6a3.tar.bz2
Fix the --help output of the toplevel configure.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac12
3 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 03167ef..3831e26 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 ba0f44f..2236790 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 b189e52..f1d220d 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