Modify for standalone distribution. The library's getting far too large

to be sensibly embedded in other programs.

diff --git a/Makefile.m4 b/Makefile.m4
index ae7117f..174ce5c 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.3 1999/10/24 10:04:26 mdw Exp $
+## $Id: Makefile.m4,v 1.4 1999/10/24 10:20:36 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,9 +29,13 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
-## Revision 1.3  1999/10/24 10:04:26  mdw
-## Install headers in the right directory.
+## Revision 1.4  1999/10/24 10:20:36  mdw
+## Modify for standalone distribution.  The library's getting far too large
+## to be sensibly embedded in other programs.
+##
+## Minor reformatting.
 ##
+## Revision 1.4  1999/10/24 10:20:36  mdw
 ## Modify for standalone distribution.  The library's getting far too large
 ## to be sensibly embedded in other programs.
 ##
@@ -92,7 +96,6 @@ BUILT_SOURCES = \
        getdate.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.h') \
-INCLUDES = -I$(srcdir)/..
        addsuffix(join(`hashes', `-', `hash_modes'), `.c') \
        addsuffix(join(`hashes', `-', `hash_modes'), `.h')
 lib_LIBRARIES = libcatacomb.a
@@ -118,7 +121,7 @@ libcatacomb_la_SOURCES = \
        dh-prime.c \
        addsuffix(join(`ciphers', `-', `cipher_modes'), `.c') \
 noinst_PROGRAMS = des-mktab
-LDADD = libcatacomb.a ../mLib/libmLib.a
+
 ## --- Utility programs ---
 noinst_PROGRAMS = des-mktab mptypes
 LDADD = libcatacomb.a
@@ -150,7 +153,7 @@ TESTS = \
        addsuffix(join(`hashes', `-', `hash_modes'), `.t') \
        addsuffix(`ciphers', `.t') addsuffix(`hashes', `.t')
        $(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
-         $(srcdir)/$1.c libcatacomb.a ../mLib/libmLib.a -o $1.t')
+         $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')
 
 `$1.t: $1.c libcatacomb.a
        $(COMPILE) -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/$1.c libcatacomb.a $(LIBS) -o $1.t')

diff --git a/configure.in b/configure.in
index 4a6ba52..ef2bf76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.2 1999/10/23 12:56:25 mdw Exp $
+dnl $Id: configure.in,v 1.3 1999/10/24 10:20:36 mdw Exp $
 dnl
 dnl Autoconfiguration for Catacomb
 dnl
@@ -29,8 +29,12 @@ dnl MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
-dnl Revision 1.2  1999/10/23 12:56:25  mdw
-dnl Version number change.
+dnl Revision 1.3  1999/10/24 10:20:36  mdw
+dnl Modify for standalone distribution.  The library's getting far too large
+dnl to be sensibly embedded in other programs.
+dnl
+dnl Modify for standalone distribution.  The library's getting far too large
+dnl to be sensibly embedded in other programs.
 dnl
 dnl Revision 1.2  1999/10/23 12:56:25  mdw
 dnl Version number change.
@@ -48,6 +52,7 @@ AM_CONFIG_HEADER(config.h)
 dnl --- Make sure I can compile and build libraries ---
 
 AC_PROG_CC
+AC_CHECK_LIB(mLib, ego)
 AC_CHECK_PROG(AR, ar, ar)
 AC_PROG_RANLIB
 mdw_MLIB

diff --git a/setup b/setup
index 3c35243..c829224 100755 (executable)
--- a/setup
+++ b/setup
@@ -2,7 +2,6 @@
 
 set -e
 mklinks
-ln -s ../mLib/build mLib
 mkaclocal
 autoheader
 m4 Makefile.m4 >Makefile.am