X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=configure.in;h=29358ec8f7a463eaf6e02bff526480acbf179da2;hb=a548b928816889f8f2aa5bfe8f755d8234ce19db;hp=35144722bc4be72faa1248309952e05dbcb0af58;hpb=fd9992da39f78bd5e4ae5bbd8c003cd2ecc8fe75;p=apps%2Fmadmutt.git

diff --git a/configure.in b/configure.in
index 3514472..29358ec 100644
--- a/configure.in
+++ b/configure.in
@@ -823,12 +823,18 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
     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
-        CPPFLAGS="$OLDCPPFLAGS"
-        LIBS="$OLDLIBS -lgdbm";
-        AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[
-            ac_cv_gdbmopen=no
+        ac_cv_gdbmopen=no
+        GDBM_DIRS="$mutt_cv_prefix /usr/local /usr"
+        AC_MSG_CHECKING([for gdbm_open])
+        for d in $GDBM_DIRS; do
+          if test x$ac_cv_gdbmopen = xno && test -d "$d/include" && test -d "$d/lib"; then
+            GDBM_INC="-I$d/include"
+            GDBM_LIB="-L$d/lib"
+            CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
+            LIBS="$OLDLIBS $GDBM_LIB -lgdbm"
             AC_TRY_LINK([#include <gdbm.h>],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes])
-        ])
+          fi
+        done
     fi
 
     ac_bdb_prefix=yes
@@ -881,8 +887,8 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
     fi
 
     if test x$ac_cv_gdbmopen = xyes; then
-        CPPFLAGS="$OLDCPPFLAGS"
-        LIBS="$OLDLIBS -lgdbm";
+        CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
+        LIBS="$OLDLIBS $GDBM_LIB -lgdbm";
         AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
     elif test x$ac_cv_dbcreate = xyes; then
         CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS"
@@ -1114,7 +1120,7 @@ fi
 dnl -- end libesmtp --
 
 AC_OUTPUT(Makefile intl/Makefile m4/Makefile
-        po/Makefile.in doc/Makefile contrib/Makefile test/Makefile
+        po/Makefile.in doc/Makefile contrib/Makefile
         muttbug.sh
         imap/Makefile
         Muttngrc.head