From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 10 Mar 2021 06:07:17 +0000 (-0500)
Subject: Fix configuration with heirloom-sh.
X-Git-Tag: v1.1~8
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/32785fcd767c52ce826f8f0ed4232360e458f118

Fix configuration with heirloom-sh.

Gnulib's conditional dependency feature installs 'if ! ...' constructs
into configure, which fail under traditional shells such as heirloom-sh.

Let's replace these constructs with more portable ones while
bootstrapping.
---

diff --git a/bootstrap b/bootstrap
index 5023d83..43fee2c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -48,6 +48,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/gnulib b/gnulib
index c9b44f2..f0d3a4d 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit c9b44f214c7c798c7701c7a281584e262b263655
+Subproject commit f0d3a4d726d16b77b3fe7fb155b29ab792452a4f