X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=configure.in;h=c3fb81a7e1cdc83fb59a16e4aa4d9d3882c8fe1b;hp=167518da3c2bfd34d7d5387b9aeaeb65fbd28965;hb=557d33aeabe46e9a0411959703f721c5b9ce2ae9;hpb=35dc2ac6e48a15b966865ec9d69326a6b2a281dd

diff --git a/configure.in b/configure.in
index 167518d..c3fb81a 100644
--- a/configure.in
+++ b/configure.in
@@ -49,7 +49,6 @@ fi
 AC_SUBST(APOPLIB)dnl
 
 dnl Do you want to debug nmh?
-undefine([debug])dnl
 AC_ARG_ENABLE(debug,
 [  --enable-debug          enable nmh code debugging])
 dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
@@ -58,7 +57,6 @@ if test x"$enable_nmh_debug" = x"yes"; then
 fi
 
 dnl Allow users to send email from addresses other than their default?
-undefine([masquerade])dnl
 AC_ARG_ENABLE(masquerade,
   [  --enable-masquerade[='draft_from mmailid username_extension']
                           enable up to 3 types of address masquerading [none]],
@@ -70,7 +68,6 @@ AC_ARG_ENABLE(masquerade,
 AC_SUBST(masquerade)dnl
 
 dnl Do you want mhe support?
-undefine([mhe])dnl
 AC_ARG_ENABLE(mhe,
 [  --enable-mhe            enable mhe support (DEFAULT)])
 
@@ -81,7 +78,6 @@ if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
 fi
 
 dnl Do you want client-side support for pop?
-undefine([pop])dnl
 AC_ARG_ENABLE(pop,
 [  --enable-pop            enable client-side support for plain POP3])
 dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
@@ -93,7 +89,7 @@ dnl Do you want client-side support for using SASL for authentication?
 dnl Note that this code will be enabled for both POP and SMTP
 AC_ARG_WITH(cyrus-sasl,
 [  --with-cyrus-sasl=<dir> Specify location of Cyrus SASL library for auth])
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   AC_DEFINE(CYRUS_SASL)dnl
   sasl_support=yes
 else
@@ -101,7 +97,6 @@ else
 fi
 
 dnl What should be the default editor?
-undefine([editor])dnl
 AC_ARG_WITH(editor,
 [  --with-editor=EDITOR    specify the default editor])
 
@@ -110,7 +105,6 @@ if test -n "$with_editor"; then
 fi
 
 dnl Set the backup prefix
-undefine([backup-prefix])dnl
 AC_ARG_WITH([hash-backup],
   [  --with-hash-backup      use # as the backup prefix (default: ,)])
 if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
@@ -148,7 +142,6 @@ AC_SUBST(POPLIB)dnl
 AC_SUBST(POPSED)dnl
 
 dnl What method of locking to use?
-undefine([locking])dnl
 AC_ARG_WITH(locking,
 [  --with-locking=LOCKTYPE specify the file locking method
                           (one of dot, fcntl, flock, lockf)])
@@ -171,7 +164,6 @@ else
 fi
 
 dnl What method of posting should post use?
-undefine([mts])dnl
 AC_ARG_WITH(mts,
 [  --with-mts=MTS          specify the default mail transport agent/service])
 
@@ -188,7 +180,6 @@ dnl Both the smtp and sendmail mail transport services use the smtp code
 AC_DEFINE(SMTPMTS)dnl
 
 dnl What should be the default pager?
-undefine([pager])dnl
 AC_ARG_WITH(pager,
 [  --with-pager=PAGER      specify the default pager])
 
@@ -197,7 +188,6 @@ if test -n "$with_pager"; then
 fi
 
 dnl What should be the default mail server(s)?
-undefine([smtpservers])dnl
 AC_ARG_WITH(smtpservers,
 [  --with-smtpservers='SMTPSERVER1[ SMTPSERVER2...]'
                           specify the default SMTP server(s) [localhost]])
@@ -374,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
@@ -563,12 +553,15 @@ 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)))))
 
 dnl ----------------
 dnl CHECK FOR NDBM.H
 dnl ----------------
-AC_CHECK_HEADERS(db1/ndbm.h)
+
+AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h, break, )
 
 dnl ----------------
 dnl CHECK FOR HESIOD
@@ -629,7 +622,7 @@ AC_SUBST(KRB4_LIBS)dnl
 dnl --------------------
 dnl CHECK FOR CYRUS SASL
 dnl --------------------
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   if test x"$with_cyrus_sasl" != x"yes"; then
     SASL_INCLUDES="-I$with_cyrus_sasl/include"
     SASL_LIBS="-L$with_cyrus_sasl/lib"
@@ -645,8 +638,8 @@ if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "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