Bump dxcommon to pull in build portability improvements.

diff --git a/NEWS b/NEWS
index e26ed7de7a2d8682f4527361683f38fc044e7a12..ef6df4bbc93d1dc4033980e53f8ee420294582d6 100644 (file)
--- 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 5023d833c0f4e1140ca15afb96f008cf620ccfc5..f92c1c763439c3f742f47ec7bcb677d6da42e874 100755 (executable)
--- 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 3a7418b75a6a5e2bc2a65264e68112ab2b63228b..aa6ab453c6ff523a4d8538554c068117f2de3aca 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3a7418b75a6a5e2bc2a65264e68112ab2b63228b
+Subproject commit aa6ab453c6ff523a4d8538554c068117f2de3aca

diff --git a/configure.ac b/configure.ac
index 0d9f96dbf44b1f77a57df6395d0030f77a35bfb7..c622738e9ca3223856f78edc62d8c255d7180d70 100644 (file)
--- 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])