summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/des425/ChangeLog8
-rw-r--r--src/lib/des425/Makefile.in3
-rw-r--r--src/lib/des425/configure.in19
3 files changed, 13 insertions, 17 deletions
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 09086f98f..01763bacd 100644
--- 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 ed77cbc33..69361c364 100644
--- 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 0b6273c74..cf25c1833 100644
--- 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