From eba5149c3a6443d9e89c0d4c5326908455a03aa7 Mon Sep 17 00:00:00 2001 From: Vladimir Marek Date: Wed, 28 May 2008 22:05:07 -0700 Subject: [PATCH] Cosmetic fix to configure --help. Closes #3060. --- ChangeLog | 24 ++++++++++++++---------- configure.ac | 18 +++++++++--------- m4/iconv.m4 | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index a107444d..94193215 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-05-28 21:44 -0700 Vincent Lefevre (7b8ef3b8ff5a) + + * po/fr.po: Updated French translation + +2008-05-23 18:39 +0200 Rocco Rutte (8a3a037ec6b3) + + * UPDATING: UPDATING: fix 1.5.18 line as noted by Kyle Wheeler + 2008-05-22 20:22 -0700 Brendan Cully (96a01436f88b) * imap/command.c: Escape LSUB mailbox names given to @@ -6,19 +14,15 @@ 2008-05-22 17:01 +0200 Rocco Rutte (d612ef757ee9) - * ChangeLog, configure.ac, m4/types.m4: Use C99 macros - "PRId64"/"PRId32" to format file sizes/offsets if available. This - fixes warning about mismatching int argument sizes on amd64. - -2008-05-22 16:34 +0200 Rocco Rutte (b97e95fd5786) + * configure.ac, m4/types.m4: Use C99 macros "PRId64"/"PRId32" to + format file sizes/offsets if available. This fixes warning about + mismatching int argument sizes on amd64. * init.h: Document that $check_mbox_size should be set before mailboxes commands -2008-05-22 14:06 +0200 Rocco Rutte (a697362846e9) - - * ChangeLog, UPDATING: Mention requirement to encode X-Label: headers - in UPDATING + * UPDATING: Mention requirement to encode X-Label: headers in + UPDATING 2008-05-21 23:20 -0700 Rocco Rutte (bba92e401440) @@ -27,7 +31,7 @@ 2008-05-21 22:59 -0700 Piarres Beobide Egaña (51c494a2e735) - * ChangeLog, po/eu.po: Updated Basque translation. + * po/eu.po: Updated Basque translation. 2008-05-21 22:55 -0700 René Clerc (e95a579cf5e4) diff --git a/configure.ac b/configure.ac index 7381f7ab..e09f4b2b 100644 --- a/configure.ac +++ b/configure.ac @@ -166,7 +166,7 @@ if test x$have_smime != xno ; then SMIMEAUX_TARGET="smime_keys" fi -AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), +AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster@<:@=PATH@:>@], [Include Mixmaster support]), [if test "$withval" != no then if test -x "$withval" @@ -192,7 +192,7 @@ if test $ISPELL != no; then AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ]) fi -AC_ARG_WITH(slang, AC_HELP_STRING([--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 #include @@ -443,7 +443,7 @@ fi AC_ARG_WITH(homespool, - AC_HELP_STRING([--with-homespool[=FILE]], [File in user's directory where new mail is spooled]), with_homespool=${withval}) + 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 with_homespool=mailbox @@ -618,7 +618,7 @@ fi dnl -- imap dependencies -- -AC_ARG_WITH(gss, AC_HELP_STRING([--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" then @@ -648,7 +648,7 @@ AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes) dnl -- end imap dependencies -- -AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP/SMTP using OpenSSL]), +AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl@<:@=PFX@:>@], [Compile in SSL support for POP/IMAP/SMTP using OpenSSL]), [ if test "$with_ssl" != "no" then if test "$need_socket" != "yes"; then @@ -681,7 +681,7 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for fi ]) -AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Compile in SSL support for POP/IMAP/SMTP using gnutls]), +AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls@<:@=PFX@:>@], [Compile in SSL support for POP/IMAP/SMTP using gnutls]), [gnutls_prefix="$withval"], [gnutls_prefix="no"]) if test "$gnutls_prefix" != "no" && test x"$need_ssl" != xyes then @@ -706,7 +706,7 @@ then fi AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes) -AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL 2 network security library]), +AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl@<:@=PFX@:>@], [Use Cyrus SASL 2 network security library]), [ if test "$with_sasl" != "no" then @@ -819,7 +819,7 @@ AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available])) AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available])) -AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], +AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb@<:@=DIR@:>@], [Use BerkeleyDB4 if gdbm is not available])) if test x$enable_hcache = xyes @@ -1070,7 +1070,7 @@ fi # libiconv dnl -- IDN depends on iconv -AC_ARG_WITH(idn, AC_HELP_STRING([--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 if test "$with_idn" != "yes" ; then diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 09a1882c..9c1f9d92 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -8,7 +8,7 @@ AC_DEFUN([MUTT_AM_ICONV], dnl those with the standalone portable GNU libiconv installed). AC_ARG_WITH([libiconv-prefix], -AC_HELP_STRING([--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 if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi -- 2.40.0