From a094cab7007f2e759ef0854a7592d2b8fd3c6b2e Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Thu, 11 Nov 1999 17:47:34 +0000
Subject: [PATCH] Updates for new configuration system, and `mptypes'
 generator.

---
 Makefile.m4  | 28 ++++++++++++++++++++--------
 configure.in | 13 ++++++++-----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Makefile.m4 b/Makefile.m4
index ab2225c..c381793 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.5 1999/11/11 00:59:17 mdw Exp $
+## $Id: Makefile.m4,v 1.6 1999/11/11 17:47:34 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,8 +29,11 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.5  1999/11/11 00:59:17  mdw
-## Minor reformatting.
+## 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.6  1999/11/11 17:47:34  mdw
 ## Updates for new configuration system, and `mptypes' generator.
@@ -49,6 +52,8 @@
 ## The `CVS' directory can't be hardlinked.  Don't worry about this
 ## overmuch.
 ##
+## Revision 1.1  1999/09/03 08:41:11  mdw
+## Initial import.
 ##
 
 AUTOMAKE_OPTIONS = foreign
@@ -88,6 +93,11 @@ MODES = \
 	adorn(`$(srcdir)/', join(`hashes', `-', `hash_modes'), `.h')
 
 $(MODES): $(srcdir)/genmodes
+$(srcdir)/des_sp.h: des-mktab
+	./des-mktab >$(srcdir)/des_sp.h
+
+ptab.c ptab.h: genprimes
+	./genprimes -h ptab.h -c ptab.c	-m 256 -t "unsigned char" -i ptab
 
 archinclude_HEADERS = mptypes.h
 
@@ -123,7 +133,8 @@ libcatacomb_la_SOURCES = \
 	dsa-sign.c dsa-verify.c dsa-gen.c \
 	dh-prime.c \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
-noinst_PROGRAMS = des-mktab
+des-base.lo: des_sp.h
+mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 noinst_PROGRAMS = des-mktab mptypes
@@ -131,6 +142,9 @@ LDADD = libcatacomb.a
 bin_SCRIPTS = catacomb-config
 noinst_PROGRAMS = des-mktab genprimes mptypes
 LDADD = libcatacomb.la
+
+key_SOURCES = keyutil.c getdate.y getdate.h
+
 genprimes_SOURCES = genprimes.c
 genprimes_LDADD =
 
@@ -155,9 +169,7 @@ TESTS = \
 	addsuffix(join(`ciphers', `-', `cipher_modes'), `.t') \
 	addsuffix(join(`hashes', `-', `hash_modes'), `.t') \
 	addsuffix(`ciphers', `.t') addsuffix(`hashes', `.t')
-	$(COMPILE) \
-	  -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
-	  $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
+## --- Testing ---
 
 `$1.t: $1.c libcatacomb.a
 	$(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
@@ -166,7 +178,7 @@ $1.t: $1.c libcatacomb.la
 
 adorn(`nl`'CTESTRIG(', `ciphers', `)')
 adorn(`nl`'CTESTRIG(', `hashes', `)')
-CLEANFILES = *.t
+adorn(`nl`'CTESTRIG(', join(`ciphers', `-', `cipher_modes'), `)')
 adorn(`nl`'CTESTRIG(', join(`hashes', `-', `hash_modes'), `)')
 CTESTRIG(dsa-verify)
 CLEANFILES = *.t mptypes.h
diff --git a/configure.in b/configure.in
index 8f035c3..d2fdd02 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.4 1999/11/11 00:58:19 mdw Exp $
+dnl $Id: configure.in,v 1.5 1999/11/11 17:47:34 mdw Exp $
 dnl
 dnl Autoconfiguration for Catacomb
 dnl
@@ -29,8 +29,11 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
-dnl Revision 1.4  1999/11/11 00:58:19  mdw
-dnl Use canned check for `ssize_t'.
+dnl Revision 1.5  1999/11/11 17:47:34  mdw
+dnl Updates for new configuration system, and `mptypes' generator.
+dnl
+dnl Revision 1.5  1999/11/11 17:47:34  mdw
+dnl Updates for new configuration system, and `mptypes' generator.
 dnl
 dnl Revision 1.4  1999/11/11 00:58:19  mdw
 dnl Use canned check for `ssize_t'.
@@ -55,7 +58,7 @@ AM_CONFIG_HEADER(config.h)
 dnl --- Make sure I can compile and build libraries ---
 
 AC_PROG_CC
-AC_CHECK_LIB(mLib, ego)
+mdw_GCC_FLAGS
 AC_CHECK_PROG(AR, ar, ar)
 AC_PROG_RANLIB
 mdw_MLIB
@@ -80,7 +83,7 @@ dnl
 dnl This is used in noise-gathering.
 
 AC_CHECK_FUNCS(setgroups)
-AC_OUTPUT(Makefile)
+
 dnl --- Done ---
 
 AC_OUTPUT(Makefile catacomb-config)
-- 
2.11.0