autoconf cleanup.

diff --git a/build-release b/build-release
index 62342cef239bedfe2de972df6a33cbc1de35e9df..b1ff147a72a7fc377ffab3ea7ab138c36715f400 100755 (executable)
--- a/build-release
+++ b/build-release
@@ -99,7 +99,7 @@ read dummy
 
 for f in $DISTFILES ; do
 #      scp1 $f $f.asc sigtrap.guug.de:/home/ftp/pub/mutt/${devel}
-       scp $f $f.asc trithemius.gnupg.org:/home/ftp/pub/mutt/${devel}
+       scp $f $f.asc trithemius.gnupg.org:/home/ftp/mutt/${devel}
 done
 
 $HOME/bin/upload-cvs

diff --git a/configure.in b/configure.in
index 01fdfec7cd4a5a812b76526b4235bf5f4deaf14b..4b0ad2b99573a173966cb8a40b5bb98116f8a004 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -79,7 +79,7 @@ else
                 OPS="$OPS \$(srcdir)/OPS.PGP"
         fi
 
-       AC_ARG_ENABLE(smime, [  --disable-smime              Disable SMIME support],
+       AC_ARG_ENABLE(smime, [  --disable-smime            Disable SMIME support],
        [       if test x$enableval = xno ; then
                        have_smime=no
                fi
@@ -611,40 +611,7 @@ AC_ARG_WITH(sasl, [  --with-sasl[=PFX]          Use Cyrus SASL library for POP/I
         ])
 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],
-        [
-        if test "$need_socket" != "yes"
-        then
-          AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
-        fi
-
-        if test "$with_sasl2" != "no"
-        then
-          if test "$with_sasl2" != "yes"
-          then
-            CPPFLAGS="$CPPFLAGS -I$with_sasl2/include"
-            LDFLAGS="$LDFLAGS -L$with_sasl2/lib"
-          fi
-
-          saved_LIBS="$LIBS"
-
-          AC_CHECK_LIB(sasl2, sasl_client_init,,
-            AC_MSG_ERROR([could not find libsasl]),)
-
-          MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
-          MUTTLIBS="$MUTTLIBS -lsasl2"
-          LIBS="$saved_LIBS"
-          AC_DEFINE(USE_SASL,1,
-                  [ Define if want to use the Cyrus SASL library for POP/IMAP authentication. ])
-          AC_DEFINE(USE_SASL2,1,
-                  [ Define if want to use version 2 of the Cyrus SASL library. ])
-          need_sasl=yes
-          need_md5=no
-        fi
-        ])
-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, [  --with-sasl2[=PFX]         Use Cyrus SASL library version 2 for POP/IMAP authentication],
         [
         if test "$need_socket" != "yes"
         then
@@ -750,7 +717,7 @@ AC_SUBST(LIBIMAPDEPS)
 
 dnl -- iconv/gettext --
 
-AC_ARG_ENABLE(iconv, [  --disable-iconv           Disable iconv support],
+AC_ARG_ENABLE(iconv, [  --disable-iconv            Disable iconv support],
         [if test x$enableval = xno ; then
                 am_cv_func_iconv=no
         fi

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index af14db16441c582c0af375e203078484f77870a1..4e2c4eca2ab75efb81bf1e25979abadaa4d890e2 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -50,7 +50,7 @@ AC_DEFUN([MUTT_AM_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
+      [  --disable-nls              Do not use Native Language Support],
       USE_NLS=$enableval, USE_NLS=yes)
     AC_MSG_RESULT($USE_NLS)
     AC_SUBST(USE_NLS)
@@ -66,7 +66,7 @@ AC_DEFUN([MUTT_AM_WITH_NLS],
    is requested.])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
+        [  --with-included-gettext    Use the GNU gettext library included here],
         nls_cv_force_use_gnu_gettext=$withval,
         nls_cv_force_use_gnu_gettext=no)
       AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)

diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 9ce6d0ca2848a9b297bd6a53bf525f7a9e99be04..601be4cb13217d240aea2aeb64cb1f7d9f433bdf 100644 (file)
--- 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],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+[  --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