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

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

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

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

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 433b44d6015913a226fcf0765ab293eda91057ae..2287b76bbfa77949486c01baf66b163ef7a020b6 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct  2 11:12:24 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 and
+               libcom_err version number to Makefile
+
+       * Makefile.in (CRYPTO_VER): Get the proper libcrypto version number
+
 Mon Sep 25 17:01:48 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the

diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 0f4276b18b0504892a9af49e3c0206af367c446e..9d7c7dfc2a170174eaa1edea5b02e65a71113a1d 100644 (file)
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -21,7 +21,10 @@ LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
 KRB4_LIBS=@KRB4_LIB@
 KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@
 DEPKRB4_LIBS=@DEPKRB4_LIB@ @DEPKRB4_CRYPTO_LIB@
-DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT) $(TOPLIBD)/libcom_err.$(SHEXT)
+CRYPTO_VER=@CRYPTO_SH_VERS@
+COMERR_VER=@COMERR_SH_VERS@
+DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER) \
+       $(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER)
 SHLIB_LIBS=$(KRB4_LIBS) $(KRB4_CRYPTO_LIBS) -lcrypto -lcom_err
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@   
 #      $(LD_UNRESOLVED_PREFIX)_et_list $(LD_UNRESOLVED_PREFIX)error_message

diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index f1cdc8bd7d32cd2b5993973c7163c011a69b198b..eb8ea40a656982ec7597a687ef0d2790012591d6 100644 (file)
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -6,23 +6,10 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 DO_SUBDIRS
-V5_MAKE_SHARED_LIB(libkrb5)
-AC_ARG_ENABLE([shared],
-[  --enable-shared         build shared libraries],[
-LinkFileDir(../libkrb5.[$](SHEXT), libkrb5.[$](SHEXT), ./krb5)
-AppendRule([all-unix:: ../libkrb5.$(SHEXT)])
-AppendRule([install-unix::     libkrb5.[$](SHEXT)
-       [$](INSTALL_DATA) libkrb5.[$](SHEXT)    \
-               [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libkrb5.[$](SHEXT)])
-])dnl
-if test -n "$krb5_cv_staticlibs_enabled" ; then
-       LinkFileDir(../libkrb5.[$](STEXT), libkrb5.[$](STEXT), ./krb5)
-        AppendRule([install-unix:: 
-       [$](INSTALL_DATA) libkrb5.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb5.[$](STEXT)
-       [$](RANLIB) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb5.[$](STEXT)]) 
-       AppendRule([all-unix:: ../libkrb5.[$](STEXT)])
-        AppendRule([all:: libkrb5.[$](STEXT)])
-fi
-AppendRule([install:: install-[$](WHAT)])
+V5_MAKE_SHARED_LIB(libkrb5,0.1,.., ./krb5)
+CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
+AC_SUBST(CRYPTO_SH_VERS)
+COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err
+AC_SUBST(COMERR_SH_VERS)
 AppendRule([all::      all-$(WHAT)])
 V5_AC_OUTPUT_MAKEFILE