sync with gnulib

2008-10-02  Paolo Bonzini  <bonzini@gnu.org>

	* autoboot: Sync with gnulib's build-aux/bootstrap.
This commit is contained in:
Paolo Bonzini committed 2008-10-02 11:10:48 +02:00
1 parent 4c2a929a92
commit 74687e4bf7
3 files changed
+20 -9

No files matched your search

+4
View File
@@ -1,3 +1,7 @@
2008-10-02 Paolo Bonzini <bonzini@gnu.org>
* autoboot: Sync with gnulib's build-aux/bootstrap.
2008-09-29 Paolo Bonzini <bonzini@gnu.org>
* autoboot: Sync with gnulib's build-aux/bootstrap.
+15 -8
View File
@@ -49,7 +49,7 @@ Options:
not to have been checked out.
--skip-po Do not download po files.
If the file autoboot.conf exists in the current working directory, its
If the file $0.conf exists in the same directory as this script, its
contents are read as shell variables to configure the bootstrap.
Running without arguments will suffice in most cases.
@@ -139,14 +139,20 @@ checkout_only_file=README-hacking
# Whether to use copies instead of symlinks.
copy=false
# Set this to '.cvsignore .gitignore' in autoboot.conf if you want
# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
# those files to be generated in directories like lib/, m4/, and po/.
# Or set it to 'auto' to make this script select which to use based
# on which version control system (if any) is used in the source directory.
vc_ignore=auto
# Override the default configuration, if necessary.
test -r autoboot.conf && . ./autoboot.conf
# Make sure that bootstrap.conf is sourced from the current directory
# if we were invoked as "sh bootstrap".
case "$0" in
*/*) test -r "$0.conf" && . "$0.conf" ;;
*) test -r "$0.conf" && . ./"$0.conf" ;;
esac
if test "$vc_ignore" = auto; then
vc_ignore=
@@ -248,8 +254,8 @@ case ${GNULIB_SRCDIR--} in
-)
if git_modules_config submodule.gnulib.url >/dev/null; then
echo "$0: getting gnulib files..."
git submodule init || exit $@
git submodule update || exit $@
git submodule init || exit $?
git submodule update || exit $?
elif [ ! -d gnulib ]; then
echo "$0: getting gnulib files..."
@@ -266,12 +272,13 @@ case ${GNULIB_SRCDIR--} in
*)
# Redirect the gnulib submodule to the directory on the command line
# if possible.
if test -d $GNULIB_SRCDIR/.git && \
if test -d "$GNULIB_SRCDIR"/.git && \
git_modules_config submodule.gnulib.url >/dev/null; then
git submodule init
git config --replace-all submodule.gnulib.url "`cd $GNULIB_SRCDIR && pwd`"
GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
echo "$0: getting gnulib files..."
git submodule update || exit $@
git submodule update || exit $?
GNULIB_SRCDIR=gnulib
fi
;;
+1 -1
Submodule gnulib updated: 4d12840eee...29dd8b5548.