Fix configuration with heirloom-sh.

[cdecl99.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 5023d833c0f4e1140ca15afb96f008cf620ccfc5..43fee2c28260a8a8f8fd4052616da6f32cbd0ff4 100755 (executable)
--- 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