summaryrefslogtreecommitdiffstats
path: root/src/kadmin.v4/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin.v4/server')
-rw-r--r--src/kadmin.v4/server/ChangeLog5
-rw-r--r--src/kadmin.v4/server/Makefile.in14
-rw-r--r--src/kadmin.v4/server/configure.in3
3 files changed, 9 insertions, 13 deletions
diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog
index a74a3e1a7..9cf6d7f5b 100644
--- a/src/kadmin.v4/server/ChangeLog
+++ b/src/kadmin.v4/server/ChangeLog
@@ -1,4 +1,9 @@
+Fri Jul 7 16:05:11 EDT 1995 Paul Park (pjpark@mit.edu)
+ * Makefile.in - Remove all explicit library handling and LDFLAGS.
+ * configure.in - Add USE_<mumble> and KRB5_LIBRARIES.
+
+
Tue Jun 27 16:05:27 EDT 1995 Paul Park (pjpark@mit.edu)
* acl_files.c - Change check for return value from fputs(3) from NULL
to EOF. That's what's returned on error.
diff --git a/src/kadmin.v4/server/Makefile.in b/src/kadmin.v4/server/Makefile.in
index 0a1dcb453..39c13ee26 100644
--- a/src/kadmin.v4/server/Makefile.in
+++ b/src/kadmin.v4/server/Makefile.in
@@ -1,16 +1,4 @@
-KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
-KDBLIB=-lkdb5
-DEPKDBLIB=$(TOPLIBD)/libkdb5.a
-
-KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-
-DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV -I.
@@ -42,7 +30,7 @@ kadm_err.c: kadm_err.et
kadm_err.h: kadm_err.et
v4kadmind: $(OBJS) $(DEPLIBS)
- $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS)
+ $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(LIBS)
install::
$(INSTALL_PROGRAM) v4kadmind ${DESTDIR}$(SERVER_BINDIR)/v4kadmind
diff --git a/src/kadmin.v4/server/configure.in b/src/kadmin.v4/server/configure.in
index 3605d9c83..47fffc7df 100644
--- a/src/kadmin.v4/server/configure.in
+++ b/src/kadmin.v4/server/configure.in
@@ -13,5 +13,8 @@ CHECK_WAIT_TYPE
CHECK_FCNTL
CHECK_SIGNALS
ET_RULES
+USE_KDB5_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
V5_USE_SHARED_LIB
V5_AC_OUTPUT_MAKEFILE