fix build problems with krb5 and hesiod support

2 files changed, 19 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1b710896ca2..f74b23ac14e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-24  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-21  Miles Bader  <miles@gnu.org>
 
         * make-docfile.c (struct rcsoc_state): New type.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 44e8089c4f7..a4b6b07fc41 100644
--- 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)