From: Bruno Haible <bruno@clisp.org>
Date: Tue, 11 Jan 2005 12:57:41 +0000 (+0000)
Subject: Fix the "configure --help" output.
X-Git-Tag: v0.14.2~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=436b91c9dc0c138e4e9962713b8ac738976e0258;p=thirdparty%2Fgettext.git

Fix the "configure --help" output.
---

diff --git a/ChangeLog b/ChangeLog
index 3c3d2b6e8..3d437e1f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-05  Bruno Haible  <bruno@clisp.org>
+
+	Fix the "configure --help" output.
+	* config/ac-help.sed: New file.
+	* configure.ac: Use it.
+	* Makefile.am (EXTRA_DIST): Add config/ac-help.sed.
+
 2005-01-05  Bruno Haible  <bruno@clisp.org>
 
 	* version.sh: Bump version number to 0.14.2-pre1.
diff --git a/Makefile.am b/Makefile.am
index e75230467..d99d8bc70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the toplevel directory of GNU gettext
-## Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
+## Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ SUBDIRS = autoconf-lib-link gettext-runtime gettext-tools
 EXTRA_DIST = \
   version.sh PACKAGING ChangeLog.0 autogen.sh \
   config/config.libpath config/reloc-ldflags config/install-reloc \
+  config/ac-help.sed \
   config/m4/fixautomake.m4 \
   config/m4/libtool.m4
 
diff --git a/configure.ac b/configure.ac
index 41b6f49b1..df8eacbb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the toplevel directory of GNU gettext
-dnl Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-1999, 2000-2003, 2005 Free Software Foundation, Inc.
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ 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($@)' && cd ..; cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -e 's|.AC_ENABLE_SHARED_DEFAULT.|yes|g' -e 's|.AC_ENABLE_STATIC_DEFAULT.|yes|g' -e 's|.AC_ENABLE_FAST_INSTALL_DEFAULT.|yes|g'])
+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($@)' && cd ..; cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f config/ac-help.sed ])
 
 AC_CONFIG_FILES([Makefile])