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, as well as removing the gl_CC_GNULIB_WARNINGS stub.

diff --git a/bootstrap b/bootstrap
index 7bb1f8dc9aef98382f6a775fdb7f9e18cccd2e97..4aff9de1b4b19b5eb9d1a6d87629990918ae3ce2 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -43,12 +43,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 f1527e8c5958c25abb54818a2e9618a85a75bec0..262d3eaea39294df3f6172b28213e927e2f3b424 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f1527e8c5958c25abb54818a2e9618a85a75bec0
+Subproject commit 262d3eaea39294df3f6172b28213e927e2f3b424

diff --git a/configure.ac b/configure.ac
index 11b12933c7a3584b5c27419ed32c4c0d6f5b58f7..ab932ce2a5f696e6bb2b9a47b7cf3cb38f0fbb64 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,7 @@ 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.
 
-dnl remove pointless gnulib warning flag check
-AC_DEFUN([gl_CC_GNULIB_WARNINGS])
+DX_PATCH_GNULIB
 
 AC_INIT([rrace], [0], [nbowler@draconx.ca])
 AC_CONFIG_HEADERS([config.h])