build: Switch to using the new subtree version of CFD.

diff --git a/.gitignore b/.gitignore
index 3a32781..bacdff7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,16 +6,26 @@ Makefile.in
 *.t
 *.to
 
-## Other common files.
-/COPYING.LIB
-
 ## Top-level generated files.
 /aclocal.m4
 /autom4te.cache/
-/config/
 /configure
 /precomp/
 
+## Skeleton configuration header.
+/config/config.h.in
+
+## GNU build syste machinery installed by `autoreconf'.
+/config/compile
+/config/config.guess
+/config/config.sub
+/config/depcomp
+/config/install-sh
+/config/ltmain.sh
+/config/missing
+/config/test-driver
+/config/ylwrap
+
 ## m4 configuration macros installed by `aclocal' and `libtoolize'.
 /m4/ax_*.m4
 /m4/libtool.m4

diff --git a/COPYING.LIB b/COPYING.LIB
new file mode 120000 (symlink)
index 0000000..8d44cb9
--- /dev/null
+++ b/COPYING.LIB
@@ -0,0 +1 @@
+.ext/cfd/licence/LGPL-2
\ No newline at end of file

diff --git a/config/auto-version b/config/auto-version
new file mode 120000 (symlink)
index 0000000..652e105
--- /dev/null
+++ b/config/auto-version
@@ -0,0 +1 @@
+../.ext/cfd/build/auto-version
\ No newline at end of file

diff --git a/config/confsubst b/config/confsubst
new file mode 120000 (symlink)
index 0000000..8e7de22
--- /dev/null
+++ b/config/confsubst
@@ -0,0 +1 @@
+../.ext/cfd/build/confsubst
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 4e8f489..64d7ba8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ mdw_AUTO_VERSION
 AC_INIT([catacomb], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([catacomb.pc.in])
 AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE([foreign parallel-tests color-tests subdir-objects])
 AC_CANONICAL_HOST
 mdw_SILENT_RULES

diff --git a/debian/control b/debian/control
index 89903a1..039f3dc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: catacomb
 Section: libs
 Priority: extra
-Build-Depends: debhelper (>= 10), python, valgrind [!armel], pkg-config,
- mlib-dev (>= 2.4.1)
+Build-Depends: debhelper (>= 10), autoconf-archive, python,
+ valgrind [!armel], pkg-config, mlib-dev (>= 2.4.1)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Standards-Version: 3.1.1
 

diff --git a/debian/rules b/debian/rules
index 3fb55de..9c783b7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #! /usr/bin/make -f
-DH_OPTIONS = --parallel --without=autoreconf -Bdebian/build
+DH_OPTIONS = --parallel -Bdebian/build
 %:; dh $@ $(DH_OPTIONS)
 
 ## Test both with and without CPU-specific optimizations.

diff --git a/m4/mdw-auto-version.m4 b/m4/mdw-auto-version.m4
new file mode 120000 (symlink)
index 0000000..db358e4
--- /dev/null
+++ b/m4/mdw-auto-version.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-auto-version.m4
\ No newline at end of file

diff --git a/m4/mdw-libtool-version-info.m4 b/m4/mdw-libtool-version-info.m4
new file mode 120000 (symlink)
index 0000000..3298202
--- /dev/null
+++ b/m4/mdw-libtool-version-info.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-libtool-version-info.m4
\ No newline at end of file

diff --git a/m4/mdw-silent-rules.m4 b/m4/mdw-silent-rules.m4
new file mode 120000 (symlink)
index 0000000..52d11e3
--- /dev/null
+++ b/m4/mdw-silent-rules.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-silent-rules.m4
\ No newline at end of file

diff --git a/progs/.gitignore b/progs/.gitignore
deleted file mode 100644 (file)
index b46a9e8..0000000
--- a/progs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/getdate.h
-/getdate.y

diff --git a/progs/getdate.h b/progs/getdate.h
new file mode 120000 (symlink)
index 0000000..0d0cf38
--- /dev/null
+++ b/progs/getdate.h
@@ -0,0 +1 @@
+../.ext/cfd/src/getdate.h
\ No newline at end of file

diff --git a/progs/getdate.y b/progs/getdate.y
new file mode 120000 (symlink)
index 0000000..29b3608
--- /dev/null
+++ b/progs/getdate.y
@@ -0,0 +1 @@
+../.ext/cfd/src/getdate.y
\ No newline at end of file