* configure.in (V5_MAKE_SHARED_LIB): Change rule to install

		version 0.1 of the library. Pass the libcrypto version
		number to Makefile

	* Makefile.in (CRYPTO_VER): Get the proper libcrypto version number

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

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 032d3c0e2cf6681cf6a2bec6ffce6f56b4eeaebc..6405146e28375cab4921b4635fd03b681277b38f 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct  2 11:12:05 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * configure.in (V5_MAKE_SHARED_LIB): Change rule to install
+               version 0.1 of the library. Pass the libcrypto version
+               number to Makefile
+
+       * Makefile.in (CRYPTO_VER): Get the proper libcrypto version number
+
 Mon Sep 25 16:54:34 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the

diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index a246c4bde2088ec655dd5c718dbd00e4f7470b5f..6a54daef10d69b7911914ee2240ad9d6d3a9177d 100644 (file)
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -92,7 +92,8 @@ LIBDONE= DONE
 #
 KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@
 DEPKRB4_LIBS=@DEPKRB4_CRYPTO_LIB@
-DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT)
+CRYPTO_VER=@CRYPTO_SH_VERS@
+DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER)
 SHLIB_LIBS=$(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 e2b382a265111794bec41b7b9eae588be8fda49f..e6c4eaf27f925c9cf40a36c163bcf2d6eb262870 100644 (file)
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -45,21 +45,8 @@ AC_FUNC_CHECK(setresuid,AC_DEFINE(HAVE_SETRESUID))
 ET_RULES
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([$(OBJS)])
-V5_MAKE_SHARED_LIB(libkrb4)
+V5_MAKE_SHARED_LIB(libkrb4,0.1,.., ./krb4)
 CopyHeader(krb_err.h,$(EHDRDIR))
-AC_ARG_ENABLE([shared],
-[  --enable-shared         build shared libraries],[
-LinkFileDir(../libkrb4.[$](SHEXT), libkrb4.[$](SHEXT), ./krb4)
-AppendRule([all-unix:: ../libkrb4.$(SHEXT)])
-AppendRule([install::  libkrb4.[$](SHEXT)
-       [$](INSTALL_DATA) libkrb4.[$](SHEXT)    \
-               [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libkrb4.[$](SHEXT)])
-])dnl
-if test -n "$krb5_cv_staticlibs_enabled" ; then
-       LinkFileDir(../libkrb4.[$](STEXT), libkrb4.[$](STEXT), ./krb4)
-        AppendRule([install:: 
-       [$](INSTALL_DATA) libkrb4.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb4.[$](STEXT)
-       [$](RANLIB) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb4.[$](STEXT)]) 
-       AppendRule([all-unix:: ../libkrb4.[$](STEXT)])
-fi
+CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
+AC_SUBST(CRYPTO_SH_VERS)
 V5_AC_OUTPUT_MAKEFILE