Shared library Makefile/configure changes and cleanup

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

9 files changed, 42 insertions, 21 deletions

diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index db2caf35af..39be1c6a67 100644
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:53:15 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Change explicit library names to -l<lib> form, and
+		change target link line to use $(LD) and associated flags.
+	* configure.in - Add shared library usage check.
+
 Sat Jun 10 23:03:25 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* kpasswd.c: krb5_auth_context redefinitions
diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index 7937b65e2a..8adb7b48dd 100644
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -3,13 +3,11 @@ LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
-DBMLIB=
-KADMLIB=$(TOPLIBD)/libkadm.a
 
 all::
 
-KLIB = $(KADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(KADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = -lkadm -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) 
 
 SRCS = \
 	$(srcdir)/kpasswd.c
@@ -21,7 +19,7 @@ OBJS = \
 all::	kpasswd
 
 kpasswd: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd
diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in
index 437cbd75f1..6399d3cc43 100644
--- a/src/kadmin/kpasswd/configure.in
+++ b/src/kadmin/kpasswd/configure.in
@@ -2,4 +2,5 @@ AC_INIT(kpasswd.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 ET_RULES
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v5client/ChangeLog b/src/kadmin/v5client/ChangeLog
index c86e030d3a..1af16a8dd5 100644
--- a/src/kadmin/v5client/ChangeLog
+++ b/src/kadmin/v5client/ChangeLog
@@ -1,3 +1,12 @@
+
+Thu Jun 15 17:54:04 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Change explicit library names to -l<lib> form, and
+		change target link line to use $(LD) and associated flags.
+		Also, remove DBMLIB, it was not used.
+	* configure.in - Remove dbm library checks, these are no longer needed
+		with the Berkeley database code.  Also, add shared library
+		usage check.
+
 Sat Jun 10 23:03:41 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* network.c: krb5_auth_context redefinitions
diff --git a/src/kadmin/v5client/Makefile.in b/src/kadmin/v5client/Makefile.in
index 08db709705..7bdef708e8 100644
--- a/src/kadmin/v5client/Makefile.in
+++ b/src/kadmin/v5client/Makefile.in
@@ -3,16 +3,15 @@ LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
-DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a 
+KDBLIB=-lkdb5
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
-KADMLIB=$(TOPLIBD)/libkadm.a
+KADMLIB=-lkadm
 DEPKADMLIB=$(TOPLIBD)/libkadm.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(SSLIB) $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB)
 
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) $(DEPKADMLIB)
@@ -33,7 +32,7 @@ SRCS= $(srcdir)/kadmin5.c \
 all:: kadmin5
 
 kadmin5: kadmin5.o $(DEPLIBS) $(OBJS)
-	$(CC) $(CFLAGS) -o kadmin5 $(OBJS) $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmin5 $(OBJS) $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kadmin5 ${DESTDIR}$(ADMIN_BINDIR)/kadmin5
diff --git a/src/kadmin/v5client/configure.in b/src/kadmin/v5client/configure.in
index 33bb048c6f..4e628dc286 100644
--- a/src/kadmin/v5client/configure.in
+++ b/src/kadmin/v5client/configure.in
@@ -5,7 +5,6 @@ AC_PROG_YACC
 AC_HAVE_HEADERS(pwd.h regex.h)
 AC_HAVE_FUNCS(strptime re_comp regcomp getcwd)
 AC_CONST
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
 SS_RULES
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog
index c2cb92393a..252475a81c 100644
--- a/src/kadmin/v5server/ChangeLog
+++ b/src/kadmin/v5server/ChangeLog
@@ -1,3 +1,12 @@
+
+Thu Jun 15 17:54:31 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Change explicit library names to -l<lib> form, and
+		change target link line to use $(LD) and associated flags.
+		Also, remove DBMLIB, it was not used.
+	* configure.in - Remove dbm library checks, these are no longer needed
+		with the Berkeley database code.  Also, add shared library
+		usage check.
+
 Wed Jun 14 17:19:09 1995  Sam Hartman  <hartmans@tardis.MIT.EDU>
 
 	* srv_acl.c (acl_get_line): Check to make sure we haven't exceeded
diff --git a/src/kadmin/v5server/Makefile.in b/src/kadmin/v5server/Makefile.in
index 46479d8f07..bde3cb18e2 100644
--- a/src/kadmin/v5server/Makefile.in
+++ b/src/kadmin/v5server/Makefile.in
@@ -3,14 +3,15 @@ LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
-DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a
-KADMLIB=$(TOPLIBD)/libkadm.a
+KDBLIB=-lkdb5
+DEPKDBLIB=$(TOPLIBD)/libkdb5.a
+KADMLIB=-lkadm
+DEPKADMLIB=$(TOPLIBD)/libkadm.a
 
 all::
 
-KLIB = $(KADMLIB) $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(KADMLIB) $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = $(KADMLIB) $(KDBLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB)
+DEPKLIB = $(DEPKADMLIB) $(DEPKDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB)
 
 SRCS = \
 	$(srcdir)/srv_main.c $(srcdir)/srv_key.c  \
@@ -25,7 +26,7 @@ OBJS = \
 all::	kadmind5
 
 kadmind5: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kadmind5 ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind5
diff --git a/src/kadmin/v5server/configure.in b/src/kadmin/v5server/configure.in
index 1c6363a82b..3919a57026 100644
--- a/src/kadmin/v5server/configure.in
+++ b/src/kadmin/v5server/configure.in
@@ -1,8 +1,6 @@
 AC_INIT(srv_main.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
 AC_FUNC_CHECK(waitpid,AC_DEFINE(HAVE_WAITPID))
 AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF))
 AC_CHECK_HEADERS(sys/select.h)
@@ -10,4 +8,5 @@ CHECK_SIGNALS
 CHECK_SETJMP
 CHECK_WAIT_TYPE
 ET_RULES
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE