From ffc086dbf2a2f4d875a5b0f8492ee4d52636b82b Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Thu, 11 Nov 1999 19:01:02 +0000
Subject: [PATCH] Use `libtool' to generate a shared library.

---
 Makefile.m4  | 20 ++++++++++++--------
 configure.in | 14 +++++++-------
 setup        |  1 +
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Makefile.m4 b/Makefile.m4
index c381793..24966e6 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.6 1999/11/11 17:47:34 mdw Exp $
+## $Id: Makefile.m4,v 1.7 1999/11/11 19:01:02 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,8 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.6  1999/11/11 17:47:34  mdw
-## Updates for new configuration system, and `mptypes' generator.
+## Revision 1.7  1999/11/11 19:01:02  mdw
+## Use `libtool' to generate a shared library.
 ##
 ## Revision 1.7  1999/11/11 19:01:02  mdw
 ## Use `libtool' to generate a shared library.
@@ -111,7 +111,11 @@ BUILT_SOURCES = \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.h')
-lib_LIBRARIES = libcatacomb.a
+
+## --- Building the main library ---
+libcatacomb_la_LDFLAGS = -version-info 0:3:0
+lib_LTLIBRARIES = libcatacomb.la
+
 libcatacomb_la_LDFLAGS = -version-info 0:4:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
@@ -124,7 +128,7 @@ pkginclude_HEADERS = \
 	ptab.h pgen.h rabin.h \
 	dsa.h dh.h \
 	allwithsuffix(`ciphers', `cipher_modes', `.h') \
-libcatacomb_a_SOURCES = \
+	allwithsuffix(`hashes', `hash_modes', `.h')
 
 define(`emit', `$1.c ')
 libcatacomb_la_SOURCES = \
@@ -138,7 +142,7 @@ mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 noinst_PROGRAMS = des-mktab mptypes
-LDADD = libcatacomb.a
+bin_PROGRAMS = key
 bin_SCRIPTS = catacomb-config
 noinst_PROGRAMS = des-mktab genprimes mptypes
 LDADD = libcatacomb.la
@@ -171,8 +175,8 @@ TESTS = \
 	addsuffix(`ciphers', `.t') addsuffix(`hashes', `.t')
 ## --- Testing ---
 
-`$1.t: $1.c libcatacomb.a
-	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
+`$1.t: $1.c libcatacomb.la
+`define(`testprogs', testprogs \
 	$1.t)dnl
 $1.t: $1.c libcatacomb.la
 
diff --git a/configure.in b/configure.in
index d2fdd02..9738d4f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.5 1999/11/11 17:47:34 mdw Exp $
+dnl $Id: configure.in,v 1.6 1999/11/11 18:56:14 mdw Exp $
 dnl
 dnl Autoconfiguration for Catacomb
 dnl
@@ -29,8 +29,8 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
-dnl Revision 1.5  1999/11/11 17:47:34  mdw
-dnl Updates for new configuration system, and `mptypes' generator.
+dnl Revision 1.6  1999/11/11 18:56:14  mdw
+dnl Use `libtool' to generate a shared library.
 dnl
 dnl Revision 1.5  1999/11/11 17:47:34  mdw
 dnl Updates for new configuration system, and `mptypes' generator.
@@ -52,16 +52,16 @@ dnl
 dnl --- Boring boilerplate ---
 
 AC_INIT(blkc.h)
-AM_INIT_AUTOMAKE(catacomb, 1.0.0pre2)
+AM_INIT_AUTOMAKE(catacomb, 1.0.0pre3)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Make sure I can compile and build libraries ---
 
 AC_PROG_CC
-mdw_GCC_FLAGS
 AC_CHECK_PROG(AR, ar, ar)
-AC_PROG_RANLIB
-mdw_MLIB
+AM_PROG_LIBTOOL
+mdw_GCC_FLAGS
+mdw_MLIB(1.6.0)
 
 AC_PROG_YACC
 
diff --git a/setup b/setup
index c829224..5a5ae75 100755
--- a/setup
+++ b/setup
@@ -2,6 +2,7 @@
 
 set -e
 mklinks
+libtoolize
 mkaclocal
 autoheader
 m4 Makefile.m4 >Makefile.am
-- 
2.11.0