Support auto-configuration of both Kerberos V4 and

Kerberos V5 for movemail, including detection of V4 and V5 header files and libraries.
author: Richard M. Stallman 1997-07-28 05:51:59 +0000
committer: Richard M. Stallman 1997-07-28 05:51:59 +0000
commit: 93de505d8598a4798916a305649e8b22311f4fa4 (patch)
tree: 6c47497eaee60540a00fa1eafd98aaf6a1bf29f2 /lib-src
parent: 375e0047f80ee036e95b9b2754bf83b65684fd22 (diff)
download: emacs-93de505d8598a4798916a305649e8b22311f4fa4.tar.gz
emacs-93de505d8598a4798916a305649e8b22311f4fa4.zip
1 files 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
+# ifdef HAVE_LIBKRB
-  /* For krb5, use -lkrb5 */
+        KRB4LIB = -lkrb
-  KRBLIB=-lkrb
+# else
-#endif
+#  ifdef HAVE_LIBKRB4
-#ifdef HAVE_LIBDES
+        KRB4LIB = -lkrb4
-  /* For krb4, use -lcrypto */
+#  endif
-  DESLIB=-ldes
+# endif
-#endif
+# ifdef HAVE_LIBDES
-#ifdef HAVE_LIBCOM_ERR
+        DESLIB = -ldes
-  COM_ERRLIB=-lcom_err
+# else
-#endif
+#  ifdef HAVE_LIBDES425
-#endif /* KERBEROS */
+        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
author	Richard M. Stallman	1997-07-28 05:51:59 +0000
committer	Richard M. Stallman	1997-07-28 05:51:59 +0000
commit	93de505d8598a4798916a305649e8b22311f4fa4 (patch)
tree	6c47497eaee60540a00fa1eafd98aaf6a1bf29f2 /lib-src
parent	375e0047f80ee036e95b9b2754bf83b65684fd22 (diff)
download	emacs-93de505d8598a4798916a305649e8b22311f4fa4.tar.gz emacs-93de505d8598a4798916a305649e8b22311f4fa4.zip

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=
182	#endif	182	#endif
183		183
184	#ifdef KERBEROS	184	#ifdef KERBEROS
185	#ifdef HAVE_LIBKRB	185	# ifdef HAVE_LIBKRB
186	/* For krb5, use -lkrb5 */	186	KRB4LIB = -lkrb
187	KRBLIB=-lkrb	187	# else
188	#endif	188	# ifdef HAVE_LIBKRB4
189	#ifdef HAVE_LIBDES	189	KRB4LIB = -lkrb4
190	/* For krb4, use -lcrypto */	190	# endif
191	DESLIB=-ldes	191	# endif
192	#endif	192	# ifdef HAVE_LIBDES
193	#ifdef HAVE_LIBCOM_ERR	193	DESLIB = -ldes
194	COM_ERRLIB=-lcom_err	194	# else
195	#endif	195	# ifdef HAVE_LIBDES425
196	#endif /* KERBEROS */	196	DESLIB = -ldes425
		197	# endif
		198	# endif
		199	# ifdef HAVE_LIBKRB5
		200	KRB5LIB = -lkrb5
		201	# endif
		202	# ifdef HAVE_LIBCRYPTO
		203	CRYPTOLIB = -lcrypto
		204	# endif
		205	# ifdef HAVE_LIBCOM_ERR
		206	COM_ERRLIB = -lcom_err
		207	# endif
		208	#endif /* KERBEROS
197		209
198	/* If HESIOD is defined, set this to "-lhesiod". */	210	/* If HESIOD is defined, set this to "-lhesiod". */
199	HESIODLIB=	211	HESIODLIB=
200		212
201	MOVE_LIBS=$(KRBLIB) $(DESLIB) $(COM_ERRLIB) $(HESIODLIB)	213	MOVE_LIBS=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(HESIODLIB)
202		214
203	#ifdef HAVE_LIBMAIL	215	#ifdef HAVE_LIBMAIL
204	LIBMAIL=-lmail	216	LIBMAIL=-lmail