X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=configure.in;h=29358ec8f7a463eaf6e02bff526480acbf179da2;hb=0d83646490348c9730d62ee47ad9c8c0e6461a62;hp=1fda7bde3bfdcef08ab0a952a9407b0897529b4b;hpb=c30879afd71ee24e706b6d8c7b7916f36407e937;p=apps%2Fmadmutt.git

diff --git a/configure.in b/configure.in
index 1fda7bd..29358ec 100644
--- a/configure.in
+++ b/configure.in
@@ -131,7 +131,7 @@ else
         if test x$have_pgp != xno ; then
                 AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1,
                     [ Define if you want classic PGP support. ])
-                PGPAUX_TARGET="pgpring pgpewrap"
+                PGPAUX_TARGET="pgpringng pgpewrapng"
                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o"
         fi
 
@@ -145,7 +145,7 @@ else
  		AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1,
                   [ Define if you want clasic S/MIME support. ])
  		MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
-		SMIMEAUX_TARGET="smime_keys"
+		SMIMEAUX_TARGET="smime_keysng"
  	fi
   
         AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
@@ -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"