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

---
 NEWS         |  3 +++
 bootstrap    | 20 ++++++++++----------
 common       |  2 +-
 configure.ac |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index e26ed7d..ef6df4b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Release 1.1a:
+	* Various bug fixes and improvements.
+
 Release 1.1:
 	* Include build system regeneration helper scripts.
 	* Fix NLS-related build problems.
diff --git a/bootstrap b/bootstrap
index 5023d83..f92c1c7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -10,14 +10,8 @@
 
 scriptname=$0
 
-err() {
-	printf '%s: %s\n' "$scriptname" "$*" 1>&2
-}
-
-die() {
-	err "$@"
-	exit 1
-}
+err () { printf '%s: %s\n' "$scriptname" "$*" 1>&2; }
+die () { err "$@"; exit 1; }
 
 : ${AUTORECONF=autoreconf}
 : ${AUTOMAKE=automake}
@@ -45,8 +39,14 @@ EOF
   exit 1
 fi
 
-$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
-	|| die "Failed to fixup Gnulib makefile fragment."
+$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.
diff --git a/common b/common
index 3a7418b..aa6ab45 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3a7418b75a6a5e2bc2a65264e68112ab2b63228b
+Subproject commit aa6ab453c6ff523a4d8538554c068117f2de3aca
diff --git a/configure.ac b/configure.ac
index 0d9f96d..c622738 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +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.
 
-AC_INIT([slotifier], [1.1], [nbowler@draconx.ca])
+AC_INIT([slotifier], [1.1a], [nbowler@draconx.ca])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects dist-xz])
-- 
2.43.2