Replace gnulib patch with new common helper macro.

Using the new DX_PATCH_GNULIB macro allows m4 to implement the
conditional dependency patches that were previously being done
in bootstrap.

diff --git a/bootstrap b/bootstrap
index 4b7c11dca79b453c9fc4a91f23e66207ce4e423f..dd1c5303b9fe897b2bf05258509e004c6cd9799b 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright © 2011-2012, 2021 Nick Bowler
+# Copyright © 2011-2012, 2021, 2023 Nick Bowler
 #
 # Simple script to get started from a fresh git checkout.
 #
@@ -40,12 +40,6 @@ fi
 $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in ||
   die "Failed to fixup Gnulib makefile fragment."
 
-# Rewrite if ! ... construts produced by gnulib conditional dependencies
-# as these fail in heirloom-sh.
-sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \
-  m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit
-mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit
-
 # Punt some automake-generated files so that Gentoo's wrapper script
 # doesn't try to detect the automake version in use.
 rm -f Makefile.in aclocal.m4

diff --git a/common b/common
index 03a26752c80546ac8cf8fc81807bb5a153786599..156615815cd9db9dfc55356939ec15d5d2ea5180 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 03a26752c80546ac8cf8fc81807bb5a153786599
+Subproject commit 156615815cd9db9dfc55356939ec15d5d2ea5180

diff --git a/configure.ac b/configure.ac
index 5099990fdb2d2d379bc2d8a6a6ad464853a9fdf7..fe3dae92897969be90707816c537af3c8b016485 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Copyright © 2019-2022 Nick Bowler
+dnl Copyright © 2019-2023 Nick Bowler
 dnl
 dnl Based on original work Copyright © 1999-2013 Jiri (George) Lebl.
 dnl
@@ -6,6 +6,8 @@ dnl License GPLv2+: GNU General Public License version 2 or any later version.
 dnl This is free software: you are free to change and redistribute it.
 dnl There is NO WARRANTY, to the extent permitted by law.
 
+DX_PATCH_GNULIB
+
 AC_INIT([GObject Builder], [2.0.20a], [nbowler@draconx.ca], [gob-dx])
 AC_CONFIG_SRCDIR([src/treefuncs.def])
 AC_CONFIG_AUX_DIR([build-aux])