./configure.ac : squeeze --help output

As discussed on curl-library_at_cool.haxx.se on 21-22.04.2014:

For some options printed by ./configure --help there is no practical use.
E.g. "./configure" on its own always enables HTTP support, except
--disable-http is provided, but there is no application for --enable-http.

When somebody wants to ./configure curl with HTTP support, the fasted
evident way to proceed is to provide --enable-http, as it takes more time
than typing the parameter, to determine if it is necessary to provide
this ./configure option.

This patch reduces the output of ./configure --help by stripping
options, which have no added value, like --enable-http (as with them
and without them, ./configure behaves the same).

diff --git a/configure.ac b/configure.ac
index 1177244..6025258 100644
--- a/configure.ac
+++ b/configure.ac
@@ -359,7 +359,6 @@ dnl switch off particular protocols
  dnl
  AC_MSG_CHECKING([whether to support http])
  AC_ARG_ENABLE(http,
-AC_HELP_STRING([--enable-http],[Enable HTTP support])
  AC_HELP_STRING([--disable-http],[Disable HTTP support]),
  [ case "$enableval" in
    no)
@@ -377,7 +376,6 @@ AC_HELP_STRING([--disable-http],[Disable HTTP support]),
  )
  AC_MSG_CHECKING([whether to support ftp])
  AC_ARG_ENABLE(ftp,
-AC_HELP_STRING([--enable-ftp],[Enable FTP support])
  AC_HELP_STRING([--disable-ftp],[Disable FTP support]),
  [ case "$enableval" in
    no)
@@ -392,7 +390,6 @@ AC_HELP_STRING([--disable-ftp],[Disable FTP support]),
  )
  AC_MSG_CHECKING([whether to support file])
  AC_ARG_ENABLE(file,
-AC_HELP_STRING([--enable-file],[Enable FILE support])
  AC_HELP_STRING([--disable-file],[Disable FILE support]),
  [ case "$enableval" in
    no)
@@ -407,7 +404,6 @@ AC_HELP_STRING([--disable-file],[Disable FILE support]),
  )
  AC_MSG_CHECKING([whether to support ldap])
  AC_ARG_ENABLE(ldap,
-AC_HELP_STRING([--enable-ldap],[Enable LDAP support])
  AC_HELP_STRING([--disable-ldap],[Disable LDAP support]),
  [ case "$enableval" in
    no)
@@ -423,8 +419,7 @@ AC_HELP_STRING([--disable-ldap],[Disable LDAP support]),
  )
  AC_MSG_CHECKING([whether to support ldaps])
  AC_ARG_ENABLE(ldaps,
-AC_HELP_STRING([--enable-ldaps],[Enable LDAPS support])
-AC_HELP_STRING([--disable-ldaps],[Disable LDAPS support]),
+AC_HELP_STRING([--disable-ldaps],[Disable LDAPS support (default:
depend on LDAP support)]),
  [ case "$enableval" in
    no)
         AC_MSG_RESULT(no)
@@ -455,8 +450,7 @@ AC_HELP_STRING([--disable-ldaps],[Disable LDAPS
support]),

  AC_MSG_CHECKING([whether to support rtsp])
  AC_ARG_ENABLE(rtsp,
-AC_HELP_STRING([--enable-rtsp],[Enable RTSP support])
-AC_HELP_STRING([--disable-rtsp],[Disable RTSP support]),
+AC_HELP_STRING([--disable-rtsp],[Disable RTSP support (default: depend
on HTTP support]),
  [ case "$enableval" in
    no)
         AC_MSG_RESULT(no)
@@ -481,7 +475,6 @@ AC_HELP_STRING([--disable-rtsp],[Disable RTSP support]),

  AC_MSG_CHECKING([whether to support proxies])
  AC_ARG_ENABLE(proxy,
-AC_HELP_STRING([--enable-proxy],[Enable proxy support])
  AC_HELP_STRING([--disable-proxy],[Disable proxy support]),
  [ case "$enableval" in
    no)
@@ -497,7 +490,6 @@ AC_HELP_STRING([--disable-proxy],[Disable proxy
support]),

  AC_MSG_CHECKING([whether to support dict])
  AC_ARG_ENABLE(dict,
-AC_HELP_STRING([--enable-dict],[Enable DICT support])
  AC_HELP_STRING([--disable-dict],[Disable DICT support]),
  [ case "$enableval" in
    no)
@@ -512,7 +504,6 @@ AC_HELP_STRING([--disable-dict],[Disable DICT support]),
  )
  AC_MSG_CHECKING([whether to support telnet])
  AC_ARG_ENABLE(telnet,
-AC_HELP_STRING([--enable-telnet],[Enable TELNET support])
  AC_HELP_STRING([--disable-telnet],[Disable TELNET support]),
  [ case "$enableval" in
    no)
@@ -527,7 +518,6 @@ AC_HELP_STRING([--disable-telnet],[Disable TELNET
support]),
  )
  AC_MSG_CHECKING([whether to support tftp])
  AC_ARG_ENABLE(tftp,
-AC_HELP_STRING([--enable-tftp],[Enable TFTP support])
  AC_HELP_STRING([--disable-tftp],[Disable TFTP support]),
  [ case "$enableval" in
    no)
@@ -543,7 +533,6 @@ AC_HELP_STRING([--disable-tftp],[Disable TFTP support]),

  AC_MSG_CHECKING([whether to support pop3])
  AC_ARG_ENABLE(pop3,
-AC_HELP_STRING([--enable-pop3],[Enable POP3 support])
  AC_HELP_STRING([--disable-pop3],[Disable POP3 support]),
  [ case "$enableval" in
    no)
@@ -560,7 +549,6 @@ AC_HELP_STRING([--disable-pop3],[Disable POP3 support]),

  AC_MSG_CHECKING([whether to support imap])
  AC_ARG_ENABLE(imap,
-AC_HELP_STRING([--enable-imap],[Enable IMAP support])
  AC_HELP_STRING([--disable-imap],[Disable IMAP support]),
  [ case "$enableval" in
    no)
@@ -577,7 +565,6 @@ AC_HELP_STRING([--disable-imap],[Disable IMAP support]),

  AC_MSG_CHECKING([whether to support smtp])
  AC_ARG_ENABLE(smtp,
-AC_HELP_STRING([--enable-smtp],[Enable SMTP support])
  AC_HELP_STRING([--disable-smtp],[Disable SMTP support]),
  [ case "$enableval" in
    no)
@@ -593,7 +580,6 @@ AC_HELP_STRING([--disable-smtp],[Disable SMTP support]),

  AC_MSG_CHECKING([whether to support gopher])
  AC_ARG_ENABLE(gopher,
-AC_HELP_STRING([--enable-gopher],[Enable Gopher support])
  AC_HELP_STRING([--disable-gopher],[Disable Gopher support]),
  [ case "$enableval" in
    no)
@@ -614,7 +600,6 @@ dnl
**********************************************************************

  AC_MSG_CHECKING([whether to provide built-in manual])
  AC_ARG_ENABLE(manual,
-AC_HELP_STRING([--enable-manual],[Enable built-in manual])
  AC_HELP_STRING([--disable-manual],[Disable built-in manual]),
  [ case "$enableval" in
    no)
@@ -635,7 +620,6 @@ dnl disable C code generation support
  dnl
  AC_MSG_CHECKING([whether to enable generation of C code])
  AC_ARG_ENABLE(libcurl_option,
-AC_HELP_STRING([--enable-libcurl-option],[Enable --libcurl C code
generation support])
  AC_HELP_STRING([--disable-libcurl-option],[Disable --libcurl C code
generation support]),
  [ case "$enableval" in
    no)
@@ -1050,8 +1034,7 @@ dnl
**********************************************************************

  AC_MSG_CHECKING([whether to enable ipv6])
  AC_ARG_ENABLE(ipv6,
-AC_HELP_STRING([--enable-ipv6],[Enable ipv6 (with ipv4) support])
  AC_HELP_STRING([--disable-ipv6],[Disable ipv6 support]),
  [ case "$enableval" in
    no)
@@ -2460,8 +2443,7 @@ dnl
**********************************************************************
  versioned_symbols_flavour=
  AC_MSG_CHECKING([whether versioned symbols are wanted])
  AC_ARG_ENABLE(versioned-symbols,
-AC_HELP_STRING([--enable-versioned-symbols], [Enable versioned symbols
in shared library])
-AC_HELP_STRING([--disable-versioned-symbols], [Disable versioned
symbols in shared library]),
+AC_HELP_STRING([--enable-versioned-symbols], [Enable versioned symbols
in shared library]),
  [ case "$enableval" in
    yes) AC_MSG_RESULT(yes)
      AC_MSG_CHECKING([if libraries can be versioned])
@@ -3184,7 +3166,6 @@ dnl disable verbose text strings
  dnl
  AC_MSG_CHECKING([whether to enable verbose strings])
  AC_ARG_ENABLE(verbose,
-AC_HELP_STRING([--enable-verbose],[Enable verbose strings])
  AC_HELP_STRING([--disable-verbose],[Disable verbose strings]),
  [ case "$enableval" in
    no)
@@ -3239,7 +3220,6 @@ dnl disable cryptographic authentication
  dnl
  AC_MSG_CHECKING([whether to enable cryptographic authentication methods])
  AC_ARG_ENABLE(crypto-auth,
-AC_HELP_STRING([--enable-crypto-auth],[Enable cryptographic
authentication])
  AC_HELP_STRING([--disable-crypto-auth],[Disable cryptographic
authentication]),
  [ case "$enableval" in
    no)
@@ -3262,7 +3242,6 @@ dnl disable TLS-SRP authentication
  dnl
  AC_MSG_CHECKING([whether to enable TLS-SRP authentication])
  AC_ARG_ENABLE(tls-srp,
-AC_HELP_STRING([--enable-tls-srp],[Enable TLS-SRP authentication])
  AC_HELP_STRING([--disable-tls-srp],[Disable TLS-SRP authentication]),
  [ case "$enableval" in
    no)
@@ -3289,7 +3268,6 @@ dnl disable cookies support
  dnl
  AC_MSG_CHECKING([whether to enable support for cookies])
  AC_ARG_ENABLE(cookies,
-AC_HELP_STRING([--enable-cookies],[Enable cookies support])
  AC_HELP_STRING([--disable-cookies],[Disable cookies support]),
  [ case "$enableval" in
    no)
@@ -3313,8 +3291,7 @@ dnl

  AC_MSG_CHECKING([whether to enforce SONAME bump])
  AC_ARG_ENABLE(soname-bump,
-AC_HELP_STRING([--enable-soname-bump],[Enable enforced SONAME bump])
-AC_HELP_STRING([--disable-soname-bump],[Disable enforced SONAME bump]),
+AC_HELP_STRING([--enable-soname-bump],[Enable enforced SONAME bump]),
  [ case "$enableval" in
    yes) AC_MSG_RESULT(yes)
           soname_bump=yes
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2014-05-25