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}
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.