X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=f769d865736cc3a8d58f185d6fd499b7dec6cea7;hb=2e691051f6a09db9a33e8be13c901b4f44f3fd1e;hp=4149de9db44dcebfde3d953b3ce9e4fc354bf1c1;hpb=937a1d5deef2727cdf22ef3afda61fe766d234df;p=mmh

diff --git a/configure.in b/configure.in
index 4149de9..f769d86 100644
--- a/configure.in
+++ b/configure.in
@@ -139,6 +139,29 @@ fi
 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)])
+
+if test x"$with_locking" = x"dot"; then
+  LOCKTYPE="dot"
+  AC_DEFINE(DOT_LOCKING)dnl
+elif test x"$with_locking" = x"flock"; then
+  LOCKTYPE="flock"
+  AC_DEFINE(FLOCK_LOCKING)dnl
+elif test x"$with_locking" = x"lockf"; then
+  LOCKTYPE="lockf"
+  AC_DEFINE(LOCKF_LOCKING)dnl
+elif test x"$with_locking" = x"fcntl"; then
+  LOCKTYPE="fcntl"
+  AC_DEFINE(FCNTL_LOCKING)dnl
+else
+  LOCKTYPE="dot"
+  AC_DEFINE(DOT_LOCKING)dnl
+fi
+
 dnl What method of posting should post use?
 undefine([mts])dnl
 AC_ARG_WITH(mts,
@@ -547,10 +570,16 @@ if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
     HESIOD_INCLUDES="-I$with_hesiod/include"
     HESIOD_LIBS="-L$with_hesiod/lib"
   fi
-  AC_CHECK_FUNC(res_send, ,
-    AC_CHECK_LIB(resolv, res_send))
-  AC_CHECK_LIB(hesiod, hes_resolve, [HESIOD_LIBS="$HESIOD_LIBS -lhesiod"],
-    [AC_MSG_ERROR(Hesiod library not found)], $HESIOD_LIBS)
+  AC_CHECK_FUNC(res_send,
+	[AC_CHECK_LIB(hesiod, hes_resolve,
+		[HESIOD_LIBS="$HESIOD_LIBS -lhesiod"],
+		[AC_MSG_ERROR(Hesiod library not found)],
+		$HESIOD_LIBS)],
+	[AC_CHECK_LIB(hesiod, hes_resolve,
+		[HESIOD_LIBS="$HESIOD_LIBS -lhesiod -lresolv"],
+		[AC_MSG_ERROR(Hesiod library not found)],
+		$HESIOD_LIBS -lresolv)])
+
 fi
 AC_SUBST(HESIOD_INCLUDES)dnl
 AC_SUBST(HESIOD_LIBS)dnl
@@ -568,13 +597,23 @@ if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
   elif test -d /usr/include/kerberosIV; then
     KRB4_INCLUDES="-I/usr/include/kerberosIV"
   fi
-  AC_CHECK_LIB(krb4, krb_rd_req,
-    [KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"],
-    [AC_CHECK_LIB(krb, krb_rd_req,
-      [KRB4_LIBS="$KRB4_LIBS -lkrb -ldes"],
-      [AC_MSG_ERROR(Kerberos 4 libraries not found)],
-      $KRB4_LIBS -ldes)],
-    $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err)
+dnl First, check if we have -lk5crypto, since that means we have a recent krb5
+
+  AC_CHECK_LIB(k5crypto, krb5_encrypt,
+	[AC_CHECK_LIB(krb4, krb_rd_req,
+		[KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
+	        [AC_MSG_ERROR(Kerberos 4 compatibility libraries not found)],
+		$KRB4_LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err)],
+
+  	[AC_CHECK_LIB(krb4, krb_rd_req,
+	    [KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"],
+	    [AC_CHECK_LIB(krb, krb_rd_req,
+	      [KRB4_LIBS="$KRB4_LIBS -lkrb -ldes"],
+	      [AC_MSG_ERROR(Kerberos 4 libraries not found)],
+	      $KRB4_LIBS -ldes)],
+	    $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err)],
+	$KRB4_LIBS)
+
 fi
 AC_SUBST(KRB4_INCLUDES)dnl
 AC_SUBST(KRB4_LIBS)dnl
@@ -828,6 +867,7 @@ config files install path  : ${nmhsysconf2}
 man page install path      : ${nmhman}
 backup prefix              : ${backup_prefix}
 transport system           : ${MTS}
+file locking type          : ${LOCKTYPE}
 default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}