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@6909 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 09086f98fb2462dc1b5ceb61292b17852310d96e..01763bacd8ca302d6fcd9b7e901acebc512a9a40 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct  2 11:07: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 version
+               number to Makefile
+
+       * Makefile.in (CRYPTO_VER): Get the proper libcrypto version number
+
 Fri Sep 29 01:28:11 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * pcbc_encrypt.c: #include autoconf.h instead of osconf.h, because

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index ed77cbc33dd6469b05c8d80f182745b3572c9e47..69361c364632fcebd0f374a310d0a0aeaf487229 100644 (file)
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -45,7 +45,8 @@ LIBDONE= DONE
 #
 # Depends on libcrypto.
 #
-DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT)
+CRYPTO_VER=@CRYPTO_SH_VERS@
+DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER)
 SHLIB_LIBS=-lcrypto
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@

diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 0b6273c74ee83057ceb2e08236bbe0778ef8b15d..cf25c18339a133860b5f4ef760ccff99b5c70479 100644 (file)
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -24,20 +24,7 @@ fi
 dnl
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([${OBJS}])
-V5_MAKE_SHARED_LIB(libdes425)
-AC_ARG_ENABLE([shared],
-[  --enable-shared         build shared libraries],[
-LinkFileDir(../libdes425.[$](SHEXT), libdes425.[$](SHEXT), ./des425)
-AppendRule([all-unix:: ../libdes425.$(SHEXT)])
-AppendRule([install::  libdes425.[$](SHEXT)
-       [$](INSTALL_DATA) libdes425.[$](SHEXT)  \
-               [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libdes425.[$](SHEXT)])
-])dnl
-if test -n "$krb5_cv_staticlibs_enabled" ; then
-       LinkFileDir(../libdes425.[$](STEXT), libdes425.[$](STEXT), ./des425)
-        AppendRule([install:: 
-       [$](INSTALL_DATA) libdes425.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)/libdes425.[$](STEXT)
-       [$](RANLIB) [$](DESTDIR)[$](KRB5_LIBDIR)/libdes425.[$](STEXT)]) 
-       AppendRule([all-unix:: ../libdes425.[$](STEXT)])
-fi
+CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
+AC_SUBST(CRYPTO_SH_VERS)
+V5_MAKE_SHARED_LIB(libdes425,0.1,.., ./des425)
 V5_AC_OUTPUT_MAKEFILE