X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=configure.in;h=a5e891c04a5c2f39fb636e5924fa6fc97111a21e;hp=3d768e4d080276fd7615e33bd420527170a864b2;hb=08baf4f8bc7623c41a9753c71aed9a4042196aac;hpb=ae5aae7b9c72dbff21f87bbc6e783d7cec1941a9

diff --git a/configure.in b/configure.in
index 3d768e4..a5e891c 100644
--- a/configure.in
+++ b/configure.in
@@ -364,7 +364,7 @@ AC_SUBST(editorpath)dnl
 dnl Check for broken vi
 AC_CACHE_CHECK(for broken vi, nmh_cv_attvibug,
 [if echo 'r /nonexist-file
-q' | ex > /dev/null 2>&1
+q' | ex > /dev/null
 then
         nmh_cv_attvibug=no
 else
@@ -553,12 +553,16 @@ dnl --------------
 dnl Checks for ndbm
 AC_CHECK_FUNC(dbm_open, ,
   AC_CHECK_LIB(ndbm, dbm_open, ,
-    AC_CHECK_LIB(dbm, dbm_open)))
+    AC_CHECK_LIB(dbm, dbm_open, ,
+      AC_CHECK_LIB(db1, dbm_open, ,
+        AC_CHECK_LIB(gdbm, dbm_open, ,
+          AC_CHECK_LIB(db, __db_ndbm_open))))))
 
 dnl ----------------
 dnl CHECK FOR NDBM.H
 dnl ----------------
-AC_CHECK_HEADERS(db1/ndbm.h)
+
+AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h db.h, break, )
 
 dnl ----------------
 dnl CHECK FOR HESIOD
@@ -635,8 +639,8 @@ if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   fi
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $SASL_LIBS"
-  AC_CHECK_LIB(sasl, sasl_client_new,
-    [SASL_LIBS="$SASL_LIBS -lsasl"],
+  AC_CHECK_LIB(sasl2, sasl_client_new,
+    [SASL_LIBS="$SASL_LIBS -lsasl2"],
     [AC_MSG_ERROR(Cyrus SASL library not found)])
   LDFLAGS="$save_LDFLAGS"
 fi