trap 'exit 1' USR1
die() { printf '%s\n' "$@" 1>&2; kill -USR1 $$; }
-git submodule update --init || echo "Failed to update Gnulib sources from git."
-if test -x ./gnulib/gnulib-tool; then
- ./gnulib/gnulib-tool --update -S || die "Failed to update Gnulib."
+: ${AUTORECONF=autoreconf}
+: ${GNULIB=gnulib}
+: ${GIT=git}
+: ${PERL=perl}
+
+$GIT submodule update --init \
+ || echo "Failed to update Gnulib sources from git."
+
+if test -x $GNULIB/gnulib-tool; then
+ $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
else
die "Gnulib sources are not properly installed in gnulib/."
fi
-autoreconf -fis
+$PERL fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in -m m4/fix-gnulib.m4 \
+ || die "Failed to fixup Gnulib makefile fragment."
+
+$AUTORECONF -fis