Bring in fix-gnulib from a submodule.

[cdecl99.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 94d0bc859e2739fe6fc495c9ff1214ba5c54dbf4..170b5c37d56c6367ad6766390fce2b9ce08c5f7d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -6,9 +6,10 @@ die() { printf '%s\n' "$@" 1>&2; kill -USR1 $$; }
 : ${AUTORECONF=autoreconf}
 : ${GNULIB=gnulib}
 : ${GIT=git}
+: ${PERL=perl}
 
 $GIT submodule update --init \
-       || echo "Failed to update Gnulib sources from git."
+       || echo "Failed to update submodules from git."
 
 if test -x $GNULIB/gnulib-tool; then
        $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
@@ -16,4 +17,7 @@ else
        die "Gnulib sources are not properly installed in gnulib/."
 fi
 
+$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
+       || die "Failed to fixup Gnulib makefile fragment."
+
 $AUTORECONF -fis