fix up hesiod and kerberos configuration problems

diff --git a/ChangeLog b/ChangeLog
index a8b05572a645d31f364c1458e67e9d9d05b6b1d5..b74bc3fb44f2a6f967a81da73084cd2c16a2b443 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-18  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: If --with-hesiod is given, look for
+       hes_getmailhost and res_send or __res_send; check hesiod and
+       resolv libraries respectively if system libraries don't supply
+       them.
+
 2001-09-05  Gerd Moellmann  <gerd@gnu.org>
 
        * configure.in: Avoid `$@' which is handled specially in

diff --git a/configure.in b/configure.in
index 650fdbc3cb9249d913f8e58a59a24fe9fec477f4..42eeaf493c1f965650b61a6823d752af7d243bdf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1961,6 +1961,23 @@ AC_CHECK_FUNCS(getpt)
 # than to expect to find it in ncurses.
 AC_CHECK_LIB(ncurses, tparm)
 
+# Do we need the Hesiod library to provide the support routines?
+if test "$with_hesiod" == yes ; then
+  # Don't set $LIBS here -- see comments above.
+  resolv=no
+  AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, ,
+     [AC_CHECK_LIB(resolv, res_send, resolv=yes,
+                 [AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])])
+  if test "$resolv" = yes ; then
+    RESOLVLIB=-lresolv
+    AC_DEFINE(HAVE_LIBRESOLV)
+  else
+    RESOLVLIB=
+  fi
+  AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost,
+       AC_DEFINE(HAVE_LIBHESIOD), :, $RESOLVLIB)])
+fi
+
 # These tell us which Kerberos-related libraries to use.
 if test "${with_kerberos+set}" = set; then
   AC_CHECK_LIB(com_err, com_err)

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index af33b97e0fadad631dc01b62915f99e2b1dde6d7..400fb1cf3106bae21744c76ebc117fe9e2f5a94b 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-18  Ken Raeburn  <raeburn@gnu.org>
+
+       * Makefile.in (HESIODLIB) [HAVE_LIBHESIOD]: Set to include
+       -lhesiod and maybe -lresolv.
+       (CRYPTOLIB) [HAVE_LIBK5CRYPTO]: Use -lk5crypto for Kerberos
+       support if it's available.
+
 2001-10-18  Andrew Innes  <andrewi@gnu.org>
 
        * makefile.nt (ALL): Do not include fakemail.

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 44e8089c4f728afe53011552488d46413fdfd22b..a4b6b07fc41c080f90def4f3aa940879678a4476 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -201,8 +201,12 @@ MOVE_FLAGS=
 # ifdef HAVE_LIBKRB5
     KRB5LIB = -lkrb5
 # endif
-# ifdef HAVE_LIBCRYPTO
+# ifdef HAVE_LIBK5CRYPTO
+    CRYPTOLIB = -lk5crypto
+# else
+#  ifdef HAVE_LIBCRYPTO
     CRYPTOLIB = -lcrypto
+#  endif
 # endif
 # ifdef HAVE_LIBCOM_ERR
     COM_ERRLIB = -lcom_err
@@ -210,7 +214,13 @@ MOVE_FLAGS=
 #endif /* KERBEROS */
 
 /* If HESIOD is defined, set this to "-lhesiod". */
-HESIODLIB=
+#ifdef HAVE_LIBHESIOD
+# ifdef HAVE_LIBRESOLV
+    HESIODLIB= -lhesiod -lresolv
+# else
+    HESIODLIB= -lhesiod
+# endif
+#endif
 
 MOVE_LIBS=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(HESIODLIB)
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 7218e726e078f88f48763e8e1f2ef0dd93352e16..7b6e159d61d4e334a47fc6926883f31133c46851 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-18  Ken Raeburn  <raeburn@gnu.org>
+
+       * config.in (HAVE_LIBHESIOD, HAVE_LIBK5CRYPTO): Undef these.
+
 2001-10-18  Andrew Innes  <andrewi@gnu.org>
 
        * fontset.c (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable

diff --git a/src/config.in b/src/config.in
index d462b75425b6b8d8ea6d8a0025f5676ed28357b2..a0edd520a9f364961b6795a94bd52e9875ae9414 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -132,6 +132,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Define to support using a Hesiod database to find the POP server.  */
 #undef HESIOD
+#undef HAVE_LIBHESIOD
 
 /* Header for Voxware or PCM sound card driver.  */
 #undef HAVE_MACHINE_SOUNDCARD_H
@@ -199,6 +200,7 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_LIBDES425
 #undef HAVE_LIBKRB5
 #undef HAVE_LIBCRYPTO
+#undef HAVE_LIBK5CRYPTO
 #undef HAVE_LIBCOM_ERR
 /* header files */
 #undef HAVE_KRB5_H