From 93de505d8598a4798916a305649e8b22311f4fa4 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Mon, 28 Jul 1997 05:51:59 +0000
Subject: [PATCH] Support auto-configuration of both Kerberos V4 and Kerberos
 V5 for movemail, including detection of V4 and V5 header files and libraries.

---
 lib-src/Makefile.in | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 4022906add6..be9752bd703 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -182,23 +182,35 @@ MOVE_FLAGS=
 #endif
 
 #ifdef KERBEROS
-#ifdef HAVE_LIBKRB
-  /* For krb5, use -lkrb5 */
-  KRBLIB=-lkrb
-#endif
-#ifdef HAVE_LIBDES
-  /* For krb4, use -lcrypto */
-  DESLIB=-ldes
-#endif
-#ifdef HAVE_LIBCOM_ERR
-  COM_ERRLIB=-lcom_err
-#endif
-#endif /* KERBEROS */
+# ifdef HAVE_LIBKRB
+	KRB4LIB = -lkrb
+# else
+#  ifdef HAVE_LIBKRB4
+	KRB4LIB = -lkrb4
+#  endif
+# endif
+# ifdef HAVE_LIBDES
+	DESLIB = -ldes
+# else
+#  ifdef HAVE_LIBDES425
+	DESLIB = -ldes425
+#  endif
+# endif
+# ifdef HAVE_LIBKRB5
+	KRB5LIB = -lkrb5
+# endif
+# ifdef HAVE_LIBCRYPTO
+	CRYPTOLIB = -lcrypto
+# endif
+# ifdef HAVE_LIBCOM_ERR
+	COM_ERRLIB = -lcom_err
+# endif
+#endif /* KERBEROS
 
 /* If HESIOD is defined, set this to "-lhesiod". */
 HESIODLIB=
 
-MOVE_LIBS=$(KRBLIB) $(DESLIB) $(COM_ERRLIB) $(HESIODLIB)
+MOVE_LIBS=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(HESIODLIB)
 
 #ifdef HAVE_LIBMAIL
 LIBMAIL=-lmail