From 74687e4bf7b3df0953a9226cf7ac9124cdc7f0db Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 29 Sep 2008 14:07:14 +0200 Subject: [PATCH] sync with gnulib 2008-10-02 Paolo Bonzini * autoboot: Sync with gnulib's build-aux/bootstrap. --- ChangeLog | 4 ++++ autoboot | 23 +++++++++++++++-------- gnulib | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3eda369..55ec97d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-10-02 Paolo Bonzini + + * autoboot: Sync with gnulib's build-aux/bootstrap. + 2008-09-29 Paolo Bonzini * autoboot: Sync with gnulib's build-aux/bootstrap. diff --git a/autoboot b/autoboot index 9f1599c..1134a65 100755 --- a/autoboot +++ b/autoboot @@ -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 ;; diff --git a/gnulib b/gnulib index 4d12840..29dd8b5 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 4d12840eee3fff74725edcf612345b15f1b02ddd +Subproject commit 29dd8b5548ce047ce51ff9a73d6c4b50c9886771