From 7280f7f44cfae62f6d34761ac88aa19da7da5dd8 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 3 May 2012 13:48:59 +0100
Subject: [PATCH] Use auto-version machinery for building.

---
 .links       | 1 +
 Makefile.m4  | 3 +--
 configure.in | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.links b/.links
index 1c96de4..21555d1 100644
--- a/.links
+++ b/.links
@@ -2,3 +2,4 @@ COPYING.LIB
 getdate.y
 getdate.h
 lib-config.in
+auto-version
diff --git a/Makefile.m4 b/Makefile.m4
index 452ac68..982cece 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -26,8 +26,6 @@
 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ## MA 02111-1307, USA.
 
-AUTOMAKE_OPTIONS = foreign
-
 SUBDIRS = tests
 
 archincludedir = $(libdir)/catacomb/include
@@ -388,6 +386,7 @@ dist-hook:
 	@for i in getdate.c gciphertab.c ghashtab.c gmactab.c; do \
 	  ln $$i $(distdir) || ln $(srcdir)/$$i $(distdir) || true; \
 	done
+	echo $(VERSION) >$(distdir)/RELEASE
 	@echo datestamp >$(distdir)/modes-stamp || true
 	@for i in calc tests; do \
 	  mkdir $(distdir)/$$i; \
diff --git a/configure.in b/configure.in
index 4a52dc3..8e83caa 100644
--- a/configure.in
+++ b/configure.in
@@ -28,10 +28,12 @@ dnl MA 02111-1307, USA.
 
 dnl --- Boring boilerplate ---
 
-AC_INIT(blkc.h)
-AM_CONFIG_HEADER(config.h)
+mdw_AUTO_VERSION
+AC_INIT(catacomb, AUTO_VERSION, mdw@distorted.org.uk)
+AC_CONFIG_SRCDIR(blkc.h)
 AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(catacomb, 2.1.1)
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(foreign)
 
 dnl --- Make sure I can compile and build libraries ---
 
-- 
2.11.0