Commit b4b9cea3 authored by Roland Levillain's avatar Roland Levillain
Browse files

Update bootstrap w.r.t. Gnulib.

	* bootstrap (git_checkout): New function.
	Use it to fetch Gnulib through Git instead of CVS.
	Pass `--aux-dir=build-aux' to gnulib-tool to help it generate
	correct paths in lib/Makefile.am.
parent 92554637
2009-11-10 Roland Levillain <roland@lrde.epita.fr>
Update bootstrap w.r.t. Gnulib.
* bootstrap (git_checkout): New function.
Use it to fetch Gnulib through Git instead of CVS.
Pass `--aux-dir=build-aux' to gnulib-tool to help it generate
correct paths in lib/Makefile.am.
2009-11-10 Roland Levillain <roland@lrde.epita.fr>
Get rid of warnings about unused arguments.
......
......@@ -2,7 +2,8 @@
# Bootstrap `Nolimips' from repository.
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -128,6 +129,19 @@ cvs_checkout() {
fi
}
git_checkout() {
if [ ! -d $1 ]; then
echo "$0: Getting $1 files..."
trap exit 1 2 13 15
trap 'rm -fr $1; exit 1' 0
git clone git://git.savannah.gnu.org/$1 $1 || exit
trap - 0
fi
}
gnulib_modules=
newline='
'
......@@ -144,7 +158,7 @@ get_modules() {
# Get gnulib files.
case ${GNULIB_SRCDIR--} in
-) cvs_checkout gnulib
-) git_checkout gnulib
GNULIB_SRCDIR=gnulib
esac
......@@ -205,7 +219,8 @@ echo "$0: Creating m4/gnulib.m4"
echo "AC_DEFUN([nolimips_GNULIB],["
for gnulib_module in $gnulib_modules; do
echo "# $gnulib_module"
$GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module
$GNULIB_SRCDIR/gnulib-tool \
--aux-dir=build-aux --extract-autoconf-snippet $gnulib_module
done | sed '/AM_GNU_GETTEXT/d'
echo "])") > ./m4/gnulib.m4
......@@ -215,7 +230,8 @@ echo "$0: Creating lib/Makefile.am"
for gnulib_module in $gnulib_modules; do
echo "# $gnulib_module"
$GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module
$GNULIB_SRCDIR/gnulib-tool \
--aux-dir=build-aux --extract-automake-snippet $gnulib_module
done | sed 's/lib_SOURCES/libtar_a_SOURCES/g' ) > lib/Makefile.am
# End of gnulib-related part.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment