summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/clients/klist/ChangeLog11
-rw-r--r--src/clients/klist/Makefile.in3
-rw-r--r--src/clients/klist/configure.in3
3 files changed, 14 insertions, 3 deletions
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 14135d24fe..3fde40fc0e 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 93f7df91eb..796a31fd25 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 608b04565f..f7a963b3fa 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