Shared library Makefile/configure changes and cleanup

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

10 files changed, 64 insertions, 19 deletions

diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog
index 2e426653c..dd39bcf91 100644
--- a/src/tests/ChangeLog
+++ b/src/tests/ChangeLog
@@ -1,3 +1,8 @@
+
+Thu Jun 15 18:10:03 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Set LD_LIBRARY_PATH to be the library directory in
+		case we've built with shared libraries.
+
 Fri Jun  9 18:56:53 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 648166b67..70520af7a 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -15,18 +15,18 @@ check:: kdb_check
 
 kdb_check:
 	$(RM) $(TEST_DB)*
-	../admin/create/kdb5_create $(KADMIN_OPTS)
-	../tests/create/kdb5_mkdums $(KTEST_OPTS) 
-	../tests/verify/kdb5_verify $(KTEST_OPTS) 
-	../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump"
-	../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
-	../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db $(TEST_DB).dump $(TEST_DB)"
-	../tests/verify/kdb5_verify $(KTEST_OPTS) 
-	../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump2"
+	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/create/kdb5_create $(KADMIN_OPTS)
+	LD_LIBRARY_PATH=$(TOPLIBD) ../tests/create/kdb5_mkdums $(KTEST_OPTS) 
+	LD_LIBRARY_PATH=$(TOPLIBD) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
+	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump"
+	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
+	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db $(TEST_DB).dump $(TEST_DB)"
+	LD_LIBRARY_PATH=$(TOPLIBD) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
+	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump2"
 	sort $(TEST_DB).dump > $(TEST_DB).sort
 	sort $(TEST_DB).dump2 > $(TEST_DB).sort2
 	cmp $(TEST_DB).sort $(TEST_DB).sort2
-	../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
+	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
 	$(RM) $(TEST_DB)*
 
 
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 25f71c7e7..90b816de4 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 18:10:55 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove DBMLIB.
+	* configure.in - Remove check for dbm libraries.  Use shared library
+		linking rules.
+
 Fri Jun  9 18:58:15 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index a462b73c7..6af3bc10c 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all:: kdb5_mkdums
 
-KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) 
-DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) 
+KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 
diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in
index 5991eeb38..d5bb2a8ee 100644
--- a/src/tests/create/configure.in
+++ b/src/tests/create/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(kdb5_mkdums.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index f64da997b..525b4ad86 100644
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,8 @@
+
+Thu Jun 15 18:13:55 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* default.exp - Setup and use LD_LIBRARY_PATH, in case we were built
+		with shared libraries.
+
 Fri Jun  9 23:45:08 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* default.exp: Use the principal "krbtest/admin@KRBTEST.COM" for
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index be2b782a9..1389ad50a 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -96,6 +96,10 @@ if ![info exists RESOLVE] {
     set RESOLVE [findfile $objdir/../resolve/resolve]
 }
 
+if ![info exists SHLIBDIR] {
+    set SHLIBDIR [findfile $objdir/../../lib]
+}
+
 # We use a couple of variables to hold shell prompts which may be
 # overridden by the user.
 
@@ -270,6 +274,15 @@ if [ info exists env(KERBEROS_SERVER)] {
     catch "unset orig_kerberos_server"
 }
 
+#
+# Set LD_LIBRARY_PATH to specify our built shared libraries.
+#
+if [info exists env(LD_LIBRARY_PATH)] {
+    set orig_ld_lib_path $env(LD_LIBRARY_PATH)
+} else {
+    catch "unset orig_ld_lib_path"
+}
+
 # setup_kerberos_env
 # Set the environment variables needed to run Kerberos programs.
 
@@ -277,6 +290,7 @@ proc setup_kerberos_env { } {
     global env
     global tmppwd
     global hostname
+    global SHLIBDIR
 
     # Set the environment variable KRB5_CONFIG to point to our krb5.conf file.
     # All the Kerberos tools check KRB5_CONFIG.
@@ -297,6 +311,9 @@ proc setup_kerberos_env { } {
     set env(KERBEROS_SERVER) "KRBTEST.COM:$hostname:3088"
     verbose "KERBEROS_SERVER=$env(KERBEROS_SERVER)"
 
+    # Tell the dynamic loader where to get our shared libraries
+    set env(LD_LIBRARY_PATH) "$SHLIBDIR"
+    verbose "LD_LIBRARY_PATH=$env(LD_LIBRARY_PATH)"
     return 1
 }
 
@@ -946,6 +963,7 @@ proc setup_root_shell { testname } {
     global rlogin_spawn_id
     global rlogin_pid
     global tmppwd
+    global env
 
     # Make sure we are using the original values of the environment
     # variables.  This means that the caller must call
@@ -1037,6 +1055,15 @@ proc setup_root_shell { testname } {
 	-re "$ROOT_PROMPT" { }
     }
 
+    # Set up our LD_LIBRARY_PATH
+    send "LD_LIBRARY_PATH=$env(LD_LIBRARY_PATH)\r"
+    expect {
+	-re "$ROOT_PROMPT" { }
+    }
+    send "export LD_LIBRARY_PATH\r"
+    expect {
+	-re "$ROOT_PROMPT" { }
+    }
 
     # Move over to the right directory.
     set dir [pwd]
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 226b5020e..6262b241e 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 18:12:00 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove DBMLIB.
+	* configure.in - Remove check for dbm libraries, use shared library
+		linking rules.
+
 Fri Jun  9 18:58:51 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index 307a33c3a..4b18e5d4e 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
 
 all:: kdb5_verify
 
-KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) 
-DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) 
+KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 
diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in
index 7dd4b6ecc..df7581590 100644
--- a/src/tests/verify/configure.in
+++ b/src/tests/verify/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(kdb5_verify.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE