From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 7 Jul 2024 22:32:13 +0000 (+0100)
Subject: Update build machinery to use in-tree Common Files Distribution.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/checkpath/commitdiff_plain/c1715f5467845421c79984befbc3d542d54ae517

Update build machinery to use in-tree Common Files Distribution.

Most significantly, the package can now be built directly from Git.
---

diff --git a/.gitignore b/.gitignore
index 160b512..250428f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,21 @@
-/COPYING
-
 /Makefile.in
 /configure
 
 /aclocal.m4
 /autom4te.cache/
-/config/
+
+/config/compile
+/config/config.guess
+/config/config.h.in
+/config/config.sub
+/config/depcomp
+/config/install-sh
+/config/ltmain.sh
+/config/missing
+
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
diff --git a/.links b/.links
deleted file mode 100644
index 5a93e8f..0000000
--- a/.links
+++ /dev/null
@@ -1,3 +0,0 @@
-COPYING
-config/auto-version
-config/confsubst
diff --git a/COPYING b/COPYING
new file mode 120000
index 0000000..782bd18
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+.ext/cfd/licence/GPL-2
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 9785ae1..739a72d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,8 @@
 ### along with chkpath; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+ACLOCAL_AMFLAGS		 = -Im4
+
 bin_PROGRAMS		 =
 lib_LTLIBRARIES		 =
 noinst_LIBRARIES	 =
diff --git a/config/auto-version b/config/auto-version
new file mode 120000
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
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 759333e..f892d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ mdw_AUTO_VERSION
 AC_INIT([Checkpath], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([checkpath.c])
 AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIRS([m4])
 mdw_SILENT_RULES
 AM_INIT_AUTOMAKE([foreign])
 
diff --git a/debian/control b/debian/control
index 45971a2..63af45e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: admin
 Priority: extra
 Build-Depends:
 	debhelper (>= 8),
+	autoconf, automake, libtool, autoconf-archive,
 	pkg-config,
 	mlib-dev (>= 2.0.4)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
diff --git a/debian/rules b/debian/rules
index 8817962..6000c39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,2 +1,2 @@
 #! /usr/bin/make -f
-%:; dh $@ --builddirectory=debian/build
+%:; dh $@ --builddirectory=debian/build --with=autoreconf
diff --git a/m4/mdw-auto-version.m4 b/m4/mdw-auto-version.m4
new file mode 120000
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
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
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