From: Theodore Tso <tytso@mit.edu>
Date: Sat, 11 Feb 1995 00:04:58 +0000 (+0000)
Subject: Add check for libsocket and libnsl (sigh).  krb5_init_ctx drags in
X-Git-Tag: krb5-1.0-beta5~720
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e271fa6d625a898ccff8f95247cc7d17bf78e224;p=krb5.git

Add check for libsocket and libnsl (sigh).  krb5_init_ctx drags in
cryptoconf.c, which drags in enough of the crypto library that
socket() gets called.  We should to fix this eventually to make klist
smaller, but the fix will be subtle.   Sigh....

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4942 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 14135d24f..3fde40fc0 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,14 @@
+Fri Feb 10 18:44:44 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in (ISODELIB): Remove ISODE cruft.  Use $(LIBS) so that
+		libsocket can be pulled in if necessary.
+
+	* configure.in: Add check for libsocket and libnsl (sigh).
+		krb5_init_ctx drags in cryptoconf.c, which drags in enough
+		of the crypto library that socket() gets called.  We should
+		to fix this eventually to make klist smaller, but the fix
+		will be subtle.
+
 Thu Feb 09 17:43:47 1995  Chris Provenzano (proven@mit.edu)
 
 	* klist.c Added -e option to print out encryption types.
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 93f7df91e..796a31fd2 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,7 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
-ISODELIB=@ISODELIB@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
@@ -10,7 +9,7 @@ KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
 
 klist: klist.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o klist klist.o $(KLIB)
+	$(CC) $(CFLAGS) -o klist klist.o $(KLIB) $(LIBS)
 
 klist.o:	$(srcdir)/klist.c
 
diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in
index 608b04565..f7a963b3f 100644
--- a/src/clients/klist/configure.in
+++ b/src/clients/klist/configure.in
@@ -4,6 +4,7 @@ AC_SET_BUILDTOP
 AC_PROG_INSTALL
 CONFIG_RULES
 KRB_INCLUDE
-ISODE_INCLUDE
+AC_CHECK_LIB(socket,main)
+AC_CHECK_LIB(nsl,main)
 WITH_KRB5ROOT
 V5_AC_OUTPUT_MAKEFILE