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

diff --git a/.gitignore b/.gitignore
index 32d2ec10241e1997a8acb8d2f7daeb8747264e45..52c8a19b79ade4764a416b3284c9685bca457395 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,30 @@
 ## Pervasive build machinery.
 Makefile.in
 
 ## Pervasive build machinery.
 Makefile.in
 

-## Common source files.
-/ui/mdwopt.c
-/ui/mdwopt.h
-
-## Other common files.
-/COPYING.LIB
-/COPYING
-

 ## Top-level generated files.
 /aclocal.m4
 /autom4te.cache/
 /configure
 ## Top-level generated files.
 /aclocal.m4
 /autom4te.cache/
 /configure

-/config/

 /precomp/
 
 /precomp/
 

+## Skeleton configuration header.
+/config/config.h.in
+
+## GNU build system machinery installed by `autoreconf'.
+/config/compile
+/config/config.guess
+/config/config.sub
+/config/depcomp
+/config/install-sh
+/config/ltmain.sh
+/config/missing
+
+## m4 configuration macros installed by `aclocal' and `libtoolize'.
+/m4/ax_*.m4
+/m4/libtool.m4
+/m4/lt*.m4
+

 ## Test machinery.
 ## Test machinery.

-/t/autotest.am

 /t/package.m4
 /t/package.m4

-/t/testsuite.at

 /t/testsuite
 /t/tests.m4
 /t/testsuite
 /t/tests.m4

diff --git a/.links b/.links
deleted file mode 100644 (file)
index e342330..0000000
--- a/.links
+++ /dev/null
@@ -1,9 +0,0 @@
-config/maninst
-config/auto-version
-config/confsubst
-ui/mdwopt.c
-ui/mdwopt.h
-t/autotest.am
-t/testsuite.at
-COPYING
-COPYING.LIB

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

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/Makefile.am b/Makefile.am
index 48f2317feb827cc3a5ec237d5976919175ca8802..310ba820530ef759b01bbc0e2acf56489078095e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@
 ### MA 02111-1307, USA.
 
 include $(top_srcdir)/vars.am
 ### MA 02111-1307, USA.
 
 include $(top_srcdir)/vars.am

+ACLOCAL_AMFLAGS                 = -Im4

 
 SUBDIRS                         =
 
 
 SUBDIRS                         =
 

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/config/maninst b/config/maninst
new file mode 120000 (symlink)
index 0000000..3298bb0
--- /dev/null
+++ b/config/maninst
@@ -0,0 +1 @@
+../.ext/cfd/build/maninst
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 60f82b9856b404ad46f468acfc1e5694ea73ff68..cd3d3c16b3b1280112785ea9e44bd8bbb1ba02e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ mdw_AUTO_VERSION
 AC_INIT([mLib], AUTO_VERSION, [mdw@distorted.org.uk], [mLib])
 AC_CONFIG_SRCDIR([mLib.pc.in])
 AC_CONFIG_AUX_DIR([config])
 AC_INIT([mLib], AUTO_VERSION, [mdw@distorted.org.uk], [mLib])
 AC_CONFIG_SRCDIR([mLib.pc.in])
 AC_CONFIG_AUX_DIR([config])

+AC_CONFIG_MACRO_DIRS([m4])

 AM_INIT_AUTOMAKE([foreign subdir-objects])
 mdw_SILENT_RULES
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 mdw_SILENT_RULES
 

diff --git a/debian/control b/debian/control
index 54a897686ed0e97a4c124147d112a1d90874bcaf..d2630fc9831fba92a1320a081a4eb690bc074dbe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mlib
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>

-Build-Depends: debhelper (>= 10), python, libadns1-dev
+Build-Depends: debhelper (>= 10), autoconf-archive, python, libadns1-dev

 Standards-Version: 3.1.1
 
 Package: mlib2
 Standards-Version: 3.1.1
 
 Package: mlib2

diff --git a/debian/rules b/debian/rules
index 4bd7c2c1d62f9bae455fa007bd18088691ac88ad..9f93fccf581ab9c8483aec5d9314932b9f204443 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -58,9 +58,6 @@ DH_install_OPTIONS_adns = --destdir=debian/tmp-adns
 ###--------------------------------------------------------------------------
 ### Additional tweaks.
 
 ###--------------------------------------------------------------------------
 ### Additional tweaks.
 

-## Don't try to rebuild our configure script.
-DH_OPTIONS += --without=autoreconf
-

 ## Some of the install lists need to be generated.  This is a little
 ## annoying.
 GEN_INSTALL_PKGS = mlib2-adns
 ## Some of the install lists need to be generated.  This is a little
 ## annoying.
 GEN_INSTALL_PKGS = mlib2-adns

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-define-paths.m4 b/m4/mdw-define-paths.m4
new file mode 120000 (symlink)
index 0000000..59213bf
--- /dev/null
+++ b/m4/mdw-define-paths.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-define-paths.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-manext.m4 b/m4/mdw-manext.m4
new file mode 120000 (symlink)
index 0000000..56bc718
--- /dev/null
+++ b/m4/mdw-manext.m4
@@ -0,0 +1 @@
+../.ext/cfd/m4/mdw-manext.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/t/autotest.am b/t/autotest.am
new file mode 120000 (symlink)
index 0000000..2309b1e
--- /dev/null
+++ b/t/autotest.am
@@ -0,0 +1 @@
+../.ext/cfd/build/autotest.am
\ No newline at end of file

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

diff --git a/ui/mdwopt.c b/ui/mdwopt.c
new file mode 120000 (symlink)
index 0000000..9bbcb66
--- /dev/null
+++ b/ui/mdwopt.c
@@ -0,0 +1 @@
+../.ext/cfd/src/mdwopt.c
\ No newline at end of file

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