summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1995-12-06 01:55:03 +0000
committerEzra Peisach <epeisach@mit.edu>1995-12-06 01:55:03 +0000
commit53214bc5b7a0c7d806ff22ff2f171f40055594e1 (patch)
tree23740aca3184aa5e8c302ed2ec7fe238c263c407 /src/lib
parent7c556c1a689b39aeca8329ec528087c3fcc080f8 (diff)
* Makefile.in: Shared library depends on krb5 library now
* configure.in: Pass krb5 library version number to Makefile. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7173 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb4/ChangeLog6
-rw-r--r--src/lib/krb4/Makefile.in10
-rw-r--r--src/lib/krb4/configure.in2
3 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 5cfac77d2..8e5eaf552 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 5 20:53:40 1995 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * Makefile.in: Shared library depends on krb5 library now.
+
+ * configure.in: Pass krb5 library version number to Makefile.
+
Wed Nov 15 20:38:38 1995 Mark Eichin <eichin@cygnus.com>
* tf_util.c (emul_flock): initialize f to a copy of a static
diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index 6a54daef1..3729c2182 100644
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -87,14 +87,18 @@ SRCS = \
LIB_SUBDIRS= .
LIBDONE= DONE
#
-# Depends on libcrypto and KRB4_CRYPTO_LIB, expect one unresolved symbol:
+# Depends on libcrypto and KRB4_CRYPTO_LIB,
# _et_list.
+# Depends on libkrb5, expect to find
+# krb5_init_context, krb5_free_context, profile_get_values
#
KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@
DEPKRB4_LIBS=@DEPKRB4_CRYPTO_LIB@
+KRB5_VER=@KRB5_SH_VERS@
CRYPTO_VER=@CRYPTO_SH_VERS@
-DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER)
-SHLIB_LIBS=$(KRB4_CRYPTO_LIBS) -lcrypto -lcom_err
+DEPLIBS=$(TOPLIBD)/libkrb5.$(SHEXT).$(KRB5_VER) \
+ $(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER)
+SHLIB_LIBS=-lkrb5 $(KRB4_CRYPTO_LIBS) -lcrypto -lcom_err
SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
index e6c4eaf27..83eca0a5d 100644
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -49,4 +49,6 @@ V5_MAKE_SHARED_LIB(libkrb4,0.1,.., ./krb4)
CopyHeader(krb_err.h,$(EHDRDIR))
CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
AC_SUBST(CRYPTO_SH_VERS)
+KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5
+AC_SUBST(KRB5_SH_VERS)
V5_AC_OUTPUT_MAKEFILE