From 7200c42b4183887f9952871909446352a984170a Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Sun, 14 Mar 2021 14:20:21 -0400
Subject: [PATCH] Bump dxcommon to pull in build portability improvements.

---
 Makefile.am      | 13 +++++++++----
 bootstrap        |  6 ++++++
 common           |  2 +-
 tests/general.at |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 84a4d95..6422661 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,12 +130,17 @@ uninstall-gob2-html:
 m4dir = $(datadir)/aclocal
 m4_DATA = gob2.m4
 
-gob2.m4: $(top_srcdir)/common/m4/gob2.m4
-	$(AM_V_GEN) $(SED) 's/DX_PROG_GOB2/GOB2_CHECK/g' \
-	  $(top_srcdir)/common/m4/gob2.m4 >$@.tmp
+gob2.m4: $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
+	$(AM_V_GEN) :; { \
+	  $(SED) -e 's/DX_PROG_GOB2/GOB2_CHECK/g' \
+	         -e 's/DX_BASENAME/GOB2_BASENAME/g' \
+	         $(DX_BASEDIR)/m4/gob2.m4 && echo && \
+	  $(SED) -e 's/DX_/GOB2_/g' -e 's/dx_fn_/gob2_fn_/g' \
+	         $(DX_BASEDIR)/m4/basename.m4; \
+	} >$@.tmp
 	$(AM_V_at) mv -f $@.tmp $@
 DISTCLEANFILES += gob2.m4
-EXTRA_DIST += common/m4/gob2.m4
+EXTRA_DIST += $(DX_BASEDIR)/m4/gob2.m4 $(DX_BASEDIR)/m4/basename.m4
 
 git_changelog_start = 2cd951c678998b2b0230c8eb25717ecf0f1dd2db
 dist-hook: generate-changelog
diff --git a/bootstrap b/bootstrap
index b5c5856..4b7c11d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -40,6 +40,12 @@ 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 1688bad..aa6ab45 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 1688bad1e5dc89cacf33bc426c92a4abf2bc0647
+Subproject commit aa6ab453c6ff523a4d8538554c068117f2de3aca
diff --git a/tests/general.at b/tests/general.at
index d7be502..624af5a 100644
--- a/tests/general.at
+++ b/tests/general.at
@@ -190,6 +190,7 @@ AT_DATA([test.in], [[@GOB2@
 cat >configure.ac <<EOF
 [m4@&t@_include([$builddir/gob2.m4])]
 [m4@&t@_pattern_forbid([^GOB2_])]
+[m4@&t@_pattern_forbid([^DX_])]
 [AC_INIT([gob2_check], [0])]
 [GOB2_CHECK(]m4_dquote(m4_defn([MYVER]))[)]
 GOB2=\`command -v \$GOB2\`
-- 
2.43.2