Support auto-configuration of both Kerberos V4 and

Kerberos V5 for movemail, including detection of V4 and V5 header
files and libraries.

diff --git a/configure.in b/configure.in
index 78f67190e9e816c5151a33fac67527ddec0fd492..768d48d8e16ff8c6018b1933bef2670e835079ad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,15 @@ AC_ARG_WITH(pop,
 AC_ARG_WITH(kerberos,
 [  --with-kerberos         support Kerberos-authenticated POP],
 [AC_DEFINE(KERBEROS)])
+AC_ARG_WITH(kerberos5,
+[  --with-kerberos5         support Kerberos version 5 authenticated POP],
+[if test "${with_kerberos5+set}" = set; then
+  if test "${with_kerberos+set}" != set; then
+    with_kerberos=yes
+    AC_DEFINE(KERBEROS)
+  fi
+fi
+AC_DEFINE(KERBEROS5)])
 AC_ARG_WITH(hesiod,
 [  --with-hesiod           support Hesiod to get the POP server host],
 [AC_DEFINE(HESIOD)])
@@ -1564,9 +1573,27 @@ AC_CHECK_LIB(ncurses, tparm)
 
 # These tell us which Kerberos-related libraries to use.
 if test "${with_kerberos+set}" = set; then
-  AC_CHECK_LIB(krb, krb_get_cred)
-  AC_CHECK_LIB(des, des_cbc_encrypt)
+  if test "${with_kerberos5+set}" != set; then
+    AC_CHECK_LIB(krb, krb_get_cred,,
+                AC_CHECK_LIB(krb4, krb_get_cred))
+    AC_CHECK_LIB(des, des_cbc_encrypt,,
+                AC_CHECK_LIB(des425, des_cbc_encrypt))
+  fi
+  AC_CHECK_LIB(krb5, krb5_init_context)
+  AC_CHECK_LIB(crypto, mit_des_cbc_encrypt)
   AC_CHECK_LIB(com_err, com_err)
+
+  if test "${with_kerberos5+set}" = set; then
+    AC_CHECK_HEADERS(krb5.h)
+  else
+    AC_CHECK_HEADERS(des.h,,
+                    AC_CHECK_HEADERS(kerberosIV/des.h,,
+                                     AC_CHECK_HEADERS(kerberos/des.h)))
+    AC_CHECK_HEADERS(krb.h,,
+                    AC_CHECK_HEADERS(kerberosIV/krb.h,,
+                                     AC_CHECK_HEADERS(kerberos/krb.h)))
+  fi
+  AC_CHECK_HEADERS(com_err.h)
 fi
 
 AC_MSG_CHECKING(whether localtime caches TZ)