X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=beac5e1841e99b97d902fb4b13ece4ef77ae884a;hp=a74f7ceed424e99096a8a43a76d5f20a545971a2;hb=91acd32003fb8eb9b3b05b35c1aa32a6c07aad43;hpb=5aef8f6af1e5e71e5fa89e5894983af88deb0870

diff --git a/configure.ac b/configure.ac
index a74f7ce..beac5e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ PKG_PROG_PKG_CONFIG
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_PROG_GPERF
+AC_PATH_PROG(GPERF, gperf, AC_MSG_ERROR([Could not find gperf]))
 AC_CHECK_TOOL(AR, ar, ar)
 
 AC_SYS_LARGEFILE
@@ -50,9 +50,6 @@ AH_TEMPLATE([SIG_ATOMIC_VOLATILE_T],
             [Some systems declare sig_atomic_t as volatile, some others -- no.
              This define will have value `sig_atomic_t' or
              `volatile sig_atomic_t' accordingly.])
-AH_TEMPLATE([ICONV_NONTRANS],
-            [Define as 1 if iconv() only converts exactly and we should treat
-             all return values other than (size_t)(-1) as equivalent.])
 
 dnl ---------------- sendmail ----------------
 
@@ -382,7 +379,6 @@ 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])
     OLDCPPFLAGS="$CPPFLAGS"
-    need_md5="yes"
 
     ac_prefer_qdbm=yes
     AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]),
@@ -414,67 +410,14 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
         fi
     fi
 
-    ac_bdb_prefix=yes
-    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 -a x$ac_qdbm_here != xyes; then
-        test x$ac_bdb_prefix = xyes && ac_bdb_prefix="${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="$MUTTLIBS -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_cv_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_qdbm_here = xyes; then
         CPPFLAGS="$OLDCPPFLAGS $QDBM_CFLAGS"
-        MUTTLIBS="$MUTTLIBS $QDBM_LIBS"
+        MUTTLIBS="$MUTTLIBS -lqdbm"
         AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
     elif test x$ac_cv_gdbmopen = xyes; then
         CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
         MUTTLIBS="$MUTTLIBS $GDBM_LIB -lgdbm";
         AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
-    elif test x$ac_cv_dbcreate = xyes; then
-        CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS"
-        MUTTLIBS="$MUTTLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
-        AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support])
     else
         AC_MSG_ERROR([You need one of: QDBM, GDBM or Sleepycat DB4 for --enable-hcache])
     fi
@@ -606,13 +549,11 @@ AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
 AC_OUTPUT(Makefile
           intl/Makefile
-          m4/Makefile
           po/Makefile.in
           apidoc/Makefile apidoc/doxygen.cfg
           lib-lib/Makefile
           lib-lua/Makefile
           lib-mime/Makefile
-          lib-hash/Makefile
           lib-mx/Makefile
           lib-sys/Makefile
           lib-ui/Makefile