Don't dump AC_ARG_PROGRAM help messages if not used.

* acgeneral.m4 (_AC_INIT_HELP): Don't.
(AC_ARG_PROGRAM): Do.

diff --git a/ChangeLog b/ChangeLog
index e96f0a6af2e115b41a66f0acd114dfe4ea6967b3..14147e265a0db3b3570aa74118e5a4d8aaaaeaef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-08  Akim Demaille  <akim@epita.fr>
+
+       Don't dump AC_ARG_PROGRAM help messages if not used.
+
+       * acgeneral.m4 (_AC_INIT_HELP): Don't.
+       (AC_ARG_PROGRAM): Do.
+
 2000-03-08  Akim Demaille  <akim@epita.fr>
 
        Don't dump X help messages when `configure' does not check for X.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 42773b6aad61fbf6d72e662ac18b9bb86f736575..1993085e8aa92a5c52006ec9f18545335fc5faf8 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1002,23 +1002,16 @@ Directories:
   --infodir=DIR           info documentation in DIR [PREFIX/info]
   --mandir=DIR            man documentation in DIR [PREFIX/man]
   --srcdir=DIR            find the sources in DIR [configure dir or ..]
-
 EOF
 
   cat <<\EOF
-Program names:
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
 
-EOF
-  cat <<\EOF
 Host type:
   --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --host=HOST        configure for HOST [guessed]
   --target=TARGET    configure for TARGET [TARGET=HOST]
 EOF
+
   cat <<\EOF]
 AC_DIVERT_POP()dnl
 AC_DIVERT_PUSH(AC_DIVERSION_HELP_END)dnl
@@ -1332,7 +1325,16 @@ esac[]dnl
 # --------------
 # FIXME: Must be run only once.  Introduce AC_DEFUN_ONCE?
 AC_DEFUN(AC_ARG_PROGRAM,
-[if test "$program_transform_name" = s,x,x,; then
+[dnl Document the options.
+AC_EXPAND_ONCE([AC_DIVERT_PUSH(AC_DIVERSION_HELP_BEGIN)dnl
+
+Program names:
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+AC_DIVERT_POP])[]dnl
+if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
 else
   # Double any \ or $.  echo might interpret backslashes.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 42773b6aad61fbf6d72e662ac18b9bb86f736575..1993085e8aa92a5c52006ec9f18545335fc5faf8 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1002,23 +1002,16 @@ Directories:
   --infodir=DIR           info documentation in DIR [PREFIX/info]
   --mandir=DIR            man documentation in DIR [PREFIX/man]
   --srcdir=DIR            find the sources in DIR [configure dir or ..]
-
 EOF
 
   cat <<\EOF
-Program names:
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
 
-EOF
-  cat <<\EOF
 Host type:
   --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --host=HOST        configure for HOST [guessed]
   --target=TARGET    configure for TARGET [TARGET=HOST]
 EOF
+
   cat <<\EOF]
 AC_DIVERT_POP()dnl
 AC_DIVERT_PUSH(AC_DIVERSION_HELP_END)dnl
@@ -1332,7 +1325,16 @@ esac[]dnl
 # --------------
 # FIXME: Must be run only once.  Introduce AC_DEFUN_ONCE?
 AC_DEFUN(AC_ARG_PROGRAM,
-[if test "$program_transform_name" = s,x,x,; then
+[dnl Document the options.
+AC_EXPAND_ONCE([AC_DIVERT_PUSH(AC_DIVERSION_HELP_BEGIN)dnl
+
+Program names:
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+AC_DIVERT_POP])[]dnl
+if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
 else
   # Double any \ or $.  echo might interpret backslashes.