X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=8be4c2eb2d1e8483ae7b4dcf2070c31f2a5df62f;hp=b70d5546c8529dfb2229c8a011b6fd903e5f8af1;hb=eab91d9d0c0f1dc1c5ac310dfe02259011c13fcd;hpb=6e997d9ff55a392658fddfda5b95742c98d7de0b

diff --git a/configure.in b/configure.in
index b70d554..8be4c2e 100644
--- a/configure.in
+++ b/configure.in
@@ -540,7 +540,7 @@ fi
 
 dnl -- imap dependencies --
 
-AC_ARG_WITH(gss, [    --with-gss[=PFX]         Compile in GSSAPI authentication for IMAP], 
+AC_ARG_WITH(gss, [  --with-gss[=PFX]           Compile in GSSAPI authentication for IMAP], 
     gss_prefix="$withval", gss_prefix="no")
 if test "$gss_prefix" != "no"
 then
@@ -713,7 +713,7 @@ AC_ARG_WITH(sasl2, [  --with-sasl2[=PFX]         Use Cyrus SASL library version
         ])
 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, [  --with-idn=[PFX]           Use GNU libidn for domain names],
 		 [
 		  if test "$with_idn" != "no" ; then
 		  	if test "$with_idn" != "yes" ; then
@@ -753,7 +753,7 @@ if test $mutt_cv_fcntl = yes; then
 fi
 
 mutt_cv_inodesort=yes
-AC_ARG_ENABLE(inodesort,  [   --disable-inodesort	Do NOT read files in maildir folders sorted by inode. ],
+AC_ARG_ENABLE(inodesort,  [  --disable-inodesort        Do NOT read files in maildir folders sorted by inode. ],
        [if test $enableval = no ; then mutt_cv_inodesort=no; fi])
 
 if test $mutt_cv_inodesort = yes; then
@@ -837,91 +837,7 @@ AC_ARG_ENABLE(hcache, [  --enable-hcache            Enable header caching],
     fi
 
     ac_bdb_prefix=yes
-    AC_ARG_WITH(bdb, [  --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
-        test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
-        for d in $ac_bdb_prefix; do
-            bdbpfx="$bdbpfx $d"
-            for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do
-                bdbpfx="$bdbpfx $d/$v"
-            done
-        done
-        BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-        AC_MSG_CHECKING([for BerkeleyDB > 4.0])
-        for d in $bdbpfx; do
-            BDB_INCLUDE_DIR=""
-            BDB_LIB_DIR=""
-            for v in / $BDB_VERSIONS; do
-                if test -r "$d/include/$v/db.h"; then
-                    BDB_INCLUDE_DIR="$d/include/$v"
-                    if test -d "$d/lib/$v"; then
-                        BDB_LIB_DIR="$d/lib/$v"
-                        for l in `echo $BDB_VERSIONS`; do
-                            CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS"
-                            LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l"
-                            AC_TRY_LINK([
-                                #include <stdlib.h>
-                                #include <db.h>
-                            ],[
-                                DB *db = NULL;
-                                db->open(db,NULL,NULL,NULL,0,0,0);
-                            ],[
-                                ac_cv_dbcreate=yes
-                                BDB_LIB="$l"
-                                break
-                            ])
-                        done
-                        test x$ac_dbcreate = xyes && break
-                    fi
-                fi
-            done
-            test x$BDB_LIB != x && break
-        done
-        if test x$ac_cv_dbcreate = xyes; then
-            AC_MSG_RESULT(yes)
-        else
-            AC_MSG_RESULT(no)
-        fi
-    fi
-
-    if test x$ac_cv_gdbmopen = xyes; then
-        CPPFLAGS="$OLDCPPFLAGS"
-        LIBS="$OLDLIBS -lgdbm";
-        AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
-    elif test x$ac_cv_dbcreate = xyes; then
-        CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS"
-        LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
-        AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support])
-    else
-        AC_MSG_ERROR(You need Sleepycat DB4 or GDBM for --enable-hcache)
-    fi
-fi])
-dnl -- end cache --
-
-dnl -- start cache --
-AC_ARG_ENABLE(hcache, [  --enable-hcache            Enable header caching],
-[if test x$enableval = xyes; then
-    AC_DEFINE(USE_HCACHE, 1, [Enable header caching])
-
-    OLDCPPFLAGS="$CPPFLAGS"
-    OLDLIBS="$LIBS"
-
-    need_md5="yes"
-    ac_prefer_gdbm=yes
-    AC_ARG_WITH(gdbm, [  --without-gdbm             Get rid of gdbm even if it is available ],
-        ac_prefer_gdbm=$withval)
-    if test x$ac_prefer_gdbm != xno; then
-        CPPFLAGS="$OLDCPPFLAGS"
-        LIBS="$OLDLIBS -lgdbm";
-        AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[
-            ac_cv_gdbmopen=no
-            AC_TRY_LINK([#include <gdbm.h>],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes])
-        ])
-    fi
-
-    ac_bdb_prefix=yes
-    AC_ARG_WITH(bdb, [  --with-bdb[=DIR]          Use BerkeleyDB4 if gdbm is not available ],
+    AC_ARG_WITH(bdb, [  --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
         test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"