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 a58c083da1bda7d5a9f2ac5cd5be478d06ad3b68..defe0a724d9463ef2e525cb73961a36752df7c61 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.
 #
@@ -48,12 +48,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 57a2e9b84fe5ec89d919373dae66bb4924926d7a..156615815cd9db9dfc55356939ec15d5d2ea5180 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 57a2e9b84fe5ec89d919373dae66bb4924926d7a
+Subproject commit 156615815cd9db9dfc55356939ec15d5d2ea5180

diff --git a/configure.ac b/configure.ac
index 9ed1a995cd79824aa9d85fc6a5c6ffa0f3446123..98cc477b38c3d0746ce46e2ef9c3074a131653d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@ dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
 dnl There is NO WARRANTY, to the extent permitted by law.
 
+DX_PATCH_GNULIB
+
 AC_PREREQ([2.68])
 AC_INIT([liblbx], [0.1], [nbowler@draconx.ca])
 AC_CONFIG_SRCDIR([src/lbx.c])