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 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 207d0dbfbbfa7ad70b59ada3a741895842958885..156615815cd9db9dfc55356939ec15d5d2ea5180 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 207d0dbfbbfa7ad70b59ada3a741895842958885
+Subproject commit 156615815cd9db9dfc55356939ec15d5d2ea5180

diff --git a/configure.ac b/configure.ac
index c7bc9072d4fbc9b8d94485588406bf55f305f4b8..ac2b384e1ab83396299f4c7cc6278d18f62d440b 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_INIT([slotifier], [1.2a], [nbowler@draconx.ca])
 AC_CONFIG_HEADERS([config.h])