Changeset 3921:500373828600

Timestamp:

2005-02-12 16:25:37 (4 years ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Use AC_HELP_STRING to pretty print configure --help screen, with mixed results.

Files:

• configure.in (modified) (34 diffs)
• m4/gettext.m4 (modified) (2 diffs)
• m4/iconv.m4 (modified) (1 diff)

configure.in

@@ -94 +94 @@
         SUBVERSION="i"
 
-        AC_ARG_ENABLE(gpgme, [  --enable-gpgme           Enable GPGME support],
+        AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),
         [       if test x$enableval = xyes; then
                         have_gpgme=yes
                 fi
         ])
-        AC_ARG_WITH(gpgme-prefix, [  --with-gpgme-prefix=PFX    prefix where GPGME is installed (optional)],
+        AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]),
         gpgme_config_prefix="$withval", gpgme_config_prefix="")
 
@@ -121 +121 @@
         AC_SUBST(LIBGPGME_LIBS)
 
-        AC_ARG_ENABLE(pgp, [  --disable-pgp              Disable PGP support],
+        AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]),
         [       if test x$enableval = xno ; then
                         have_pgp=no
@@ -134 +134 @@
         fi
 
-        AC_ARG_ENABLE(smime, [  --disable-smime            Disable SMIME support],
+        AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]),
         [       if test x$enableval = xno ; then
                         have_smime=no
@@ -147 +147 @@
         fi
   
-        AC_ARG_WITH(mixmaster, [  --with-mixmaster[=PATH]    Include Mixmaster support],
+        AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
                 [if test -x "$withval" ; then
                         MIXMASTER="$withval"
@@ -176 +176 @@
 fi
 
-AC_ARG_WITH(slang, [  --with-slang[=DIR]         Use S-Lang instead of ncurses],
+AC_ARG_WITH(slang, AC_HELP_STRING([--with-slang[=DIR]], [Use S-Lang instead of ncurses]),
         [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish,
                 [AC_TRY_RUN([#include <sys/param.h>
@@ -241 +241 @@
 
         [mutt_cv_curses=/usr
-        AC_ARG_WITH(curses, [  --with-curses=DIR          Where ncurses is installed ],
+        AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses=DIR], [Where ncurses is installed]),
                 [if test $withval != yes; then
                         mutt_cv_curses=$withval
@@ -352 +352 @@
 AC_CHECK_FUNCS(fchdir, , [mutt_cv_fchdir=no])
 
-AC_ARG_WITH(regex, [  --with-regex               Use the GNU regex library ],
+AC_ARG_WITH(regex, AC_HELP_STRING([--with-regex], [Use the GNU regex library]),
         [mutt_cv_regex=yes],
         [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)])
@@ -376 +376 @@
 
 
-AC_ARG_WITH(homespool, [  --with-homespool[=FILE]    File in user's directory where new mail is spooled], with_homespool=${withval})
+AC_ARG_WITH(homespool,
+  AC_HELP_STRING([--with-homespool[=FILE]], [File in user's directory where new mail is spooled]), with_homespool=${withval})
 if test x$with_homespool != x; then
         if test $with_homespool = yes; then
@@ -390 +391 @@
         mutt_cv_setgid=no
 else
-        AC_ARG_WITH(mailpath, [  --with-mailpath=DIR        Directory where spool mailboxes are located],
+        AC_ARG_WITH(mailpath, AC_HELP_STRING([--with-mailpath=DIR], [Directory where spool mailboxes are located]),
                 [mutt_cv_mailpath=$withval],
                 [ AC_CACHE_CHECK(where new mail is stored, mutt_cv_mailpath,
@@ -446 +447 @@
 fi
 
-AC_ARG_ENABLE(external_dotlock, [  --enable-external-dotlock  Force use of an external dotlock program],
+AC_ARG_ENABLE(external_dotlock, AC_HELP_STRING([--enable-external-dotlock], [Force use of an external dotlock program]),
         [mutt_cv_external_dotlock="$enableval"])
 
@@ -462 +463 @@
 
 AC_MSG_CHECKING(where to put the documentation)
-AC_ARG_WITH(docdir, [  --with-docdir=PATH         Specify where to put the documentation],
+AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]),
         [mutt_cv_docdir=$withval],
         [mutt_cv_docdir="$mutt_cv_prefix/doc/mutt"])
@@ -480 +481 @@
 AC_SUBST(DOTLOCK_PERMISSION)
 
-AC_ARG_WITH(domain, [  --with-domain=DOMAIN       Specify your DNS domain name],
+AC_ARG_WITH(domain, AC_HELP_STRING([--with-domain=DOMAIN], [Specify your DNS domain name]),
         [if test $withval != yes; then
                 AC_DEFINE_UNQUOTED(DOMAIN,"$withval",[ Define your domain name. ])
@@ -489 +490 @@
 dnl -- socket dependencies --
 
-AC_ARG_ENABLE(pop,  [  --enable-pop               Enable POP3 support],
+AC_ARG_ENABLE(pop,  AC_HELP_STRING([--enable-pop], [Enable POP3 support]),
 [       if test x$enableval = xyes ; then
                 AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
@@ -498 +499 @@
 ])
 
-AC_ARG_ENABLE(imap, [  --enable-imap              Enable IMAP support],
+AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]),
 [       if test x$enableval = xyes ; then
                 AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ])
@@ -529 +530 @@
 dnl -- imap dependencies --
 
-AC_ARG_WITH(gss, [    --with-gss[=PFX]         Compile in GSSAPI authentication for IMAP], 
+AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentication for IMAP]), 
     gss_prefix="$withval", gss_prefix="no")
 if test "$gss_prefix" != "no"
@@ -559 +560 @@
 dnl -- end imap dependencies --
 
-AC_ARG_WITH(ssl, [  --with-ssl[=PFX]           Compile in SSL support for POP/IMAP],
+AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]),
 [       if test "$with_ssl" != "no"
         then
@@ -589 +590 @@
 
 dnl SSL support via NSS
-AC_ARG_WITH(nss, [  --with-nss[=PFX]           Compile in SSL support for POP/IMAP via NSS],
+AC_ARG_WITH(nss, AC_HELP_STRING([--with-nss[=PFX]], [Compile in SSL support for POP/IMAP via NSS]),
 [       if test "$with_nss" != no
         then
@@ -612 +613 @@
 ])
 
-AC_ARG_WITH([gnutls], [  --with-gnutls[=PFX]        Enable SSL support using gnutls],
+AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support using gnutls]),
     [gnutls_prefix="$withval"], [gnutls_prefix="no"])
 if test "$gnutls_prefix" != "no"
@@ -633 +634 @@
 fi
 
-AC_ARG_WITH(sasl, [  --with-sasl[=PFX]          Use Cyrus SASL library for POP/IMAP authentication],
+AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]),
         [
         if test "$need_socket" != "yes"
@@ -663 +664 @@
 AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes)
 
-AC_ARG_WITH(sasl2, [  --with-sasl2[=PFX]         Use Cyrus SASL library version 2 for POP/IMAP authentication],
+AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
         [
         if test "$need_socket" != "yes"
@@ -695 +696 @@
 AM_CONDITIONAL(USE_SASL, test x$need_sasl = xyes)
 
-AC_ARG_WITH(idn, [  --with-idn=[PFX]            Use GNU libidn for domain names],
+AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn=[PFX]], [Use GNU libidn for domain names]),
                  [
                   if test "$with_idn" != "no" ; then
@@ -715 +716 @@
 dnl -- end socket --
 
-AC_ARG_ENABLE(debug, [  --enable-debug             Enable debugging support],
+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]),
         [ if test x$enableval = xyes ; then
                 AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ])
@@ -721 +722 @@
          ])
 
-AC_ARG_ENABLE(flock, [  --enable-flock             Use flock() to lock files],
+AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]),
         [if test $enableval = yes; then
                 AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ])
@@ -727 +728 @@
 
 mutt_cv_fcntl=yes
-AC_ARG_ENABLE(fcntl, [  --disable-fcntl            Do NOT use fcntl() to lock files ],
+AC_ARG_ENABLE(fcntl, AC_HELP_STRING([--disable-fcntl], [Do NOT use fcntl() to lock files]),
         [if test $enableval = no; then mutt_cv_fcntl=no; fi])
 
@@ -737 +738 @@
 dnl quickly change the default to "yes" again.
 mutt_cv_inodesort=no
-AC_ARG_ENABLE(inodesort,  [   --enable-inodesort        Read files in maildir folders sorted by inode. ],
+AC_ARG_ENABLE(inodesort,  AC_HELP_STRING([--enable-inodesort], [Read files in maildir folders sorted by inode]),
        [if test x$enableval = xyes ; then mutt_cv_inodesort=yes; fi])
 
@@ -745 +746 @@
 
 mutt_cv_warnings=yes
-AC_ARG_ENABLE(warnings, [  --disable-warnings         Turn off compiler warnings (not recommended)],
+AC_ARG_ENABLE(warnings, AC_HELP_STRING([--disable-warnings], [Turn off compiler warnings (not recommended)]),
 [if test $enableval = no; then
         mutt_cv_warnings=no
@@ -754 +755 @@
 fi
 
-AC_ARG_ENABLE(nfs-fix, [  --enable-nfs-fix           Work around an NFS with broken attributes caching ],
+AC_ARG_ENABLE(nfs-fix, AC_HELP_STRING([--enable-nfs-fix], [Work around an NFS with broken attributes caching]),
         [if test x$enableval = xyes; then
                 AC_DEFINE(NFS_ATTRIBUTE_HACK,1,
@@ -762 +763 @@
         fi])
 
-AC_ARG_ENABLE(buffy-size, [  --enable-buffy-size        Use file size attribute instead of access time ],
+AC_ARG_ENABLE(buffy-size, AC_HELP_STRING([--enable-buffy-size], [Use file size attribute instead of access time]),
         [if test x$enableval = xyes; then
                 AC_DEFINE(BUFFY_SIZE,1,[ Define to enable the "buffy_size" feature. ])
         fi])
 
-AC_ARG_ENABLE(mailtool, [  --enable-mailtool          Enable Sun mailtool attachments support ],
+AC_ARG_ENABLE(mailtool, AC_HELP_STRING([--enable-mailtool], [Enable Sun mailtool attachments support]),
         [if test x$enableval = xyes; then
                 AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ])
         fi])
 
-AC_ARG_ENABLE(locales-fix, [  --enable-locales-fix       The result of isprint() is unreliable ],
+AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable]),
         [if test x$enableval = xyes; then
                 AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
         fi])
 
-AC_ARG_WITH(exec-shell, [  --with-exec-shell=SHELL    Specify alternate shell (ONLY if /bin/sh is broken)],
+AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
         [if test $withval != yes; then
                 AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
@@ -786 +787 @@
         [AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")])
 
-AC_ARG_ENABLE(exact-address, [  --enable-exact-address     Enable regeneration of email addresses],
+AC_ARG_ENABLE(exact-address, AC_HELP_STRING([--enable-exact-address], [Enable regeneration of email addresses]),
         [if test $enableval = yes; then
                 AC_DEFINE(EXACT_ADDRESS,1,
@@ -795 +796 @@
 
 dnl -- start cache --
-AC_ARG_ENABLE(hcache, [  --enable-hcache            Enable header caching],
+AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]),
 [if test x$enableval = xyes; then
     AC_DEFINE(USE_HCACHE, 1, [Enable header caching])
@@ -805 +806 @@
     need_md5="yes"
     ac_prefer_gdbm=yes
-    AC_ARG_WITH(gdbm, [  --without-gdbm             Get rid of gdbm even if it is available ],
+    AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]),
         ac_prefer_gdbm=$withval)
     if test x$ac_prefer_gdbm != xno; then
@@ -817 +818 @@
 
     ac_bdb_prefix=yes
-    AC_ARG_WITH(bdb, [  --with-bdb[=DIR]          Use BerkeleyDB4 if gdbm is not available ],
+    AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available]),
         ac_bdb_prefix=$withval)
     if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then
@@ -891 +892 @@
 dnl -- iconv/gettext --
 
-AC_ARG_ENABLE(iconv, [  --disable-iconv            Disable iconv support],
+AC_ARG_ENABLE(iconv, AC_HELP_STRING([--disable-iconv], [Disable iconv support]),
         [if test x$enableval = xno ; then
                 am_cv_func_iconv=no
@@ -1046 +1047 @@
 
 wc_funcs=maybe
-AC_ARG_WITH(wc-funcs, [  --without-wc-funcs         Do not use the system's wchar_t functions],
+AC_ARG_WITH(wc-funcs, AC_HELP_STRING([--without-wc-funcs], [Do not use the system's wchar_t functions]),
         wc_funcs=$withval)
 

m4/gettext.m4

@@ -51 +51 @@
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
-      [  --disable-nls              Do not use Native Language Support],
+      AC_HELP_STRING([--disable-nls], [Do not use Native Language Support]),
       USE_NLS=$enableval, USE_NLS=yes)
     AC_MSG_RESULT($USE_NLS)
@@ -67 +67 @@
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext    Use the GNU gettext library included here],
+        AC_HELP_STRING([--with-included-gettext], [Use the GNU gettext library included here]),
         nls_cv_force_use_gnu_gettext=$withval,
         nls_cv_force_use_gnu_gettext=no)

m4/iconv.m4

@@ -9 +9 @@
 
   AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR Search for libiconv in DIR/include and DIR/lib], [
+AC_HELP_STRING([--with-libiconv-prefix=DIR], [Search for libiconv in DIR/include and DIR/lib]), [
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi