[libvirt] [PATCH 1/4] Update gnulib to fix mingw64 compilation errors

--- .gnulib | 2 +- bootstrap | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gnulib b/.gnulib index dd6b2d7..2f0ed93 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit dd6b2d751b3c6ad417f6a4c48f2adb9d27cc59d2 +Subproject commit 2f0ed93050ab6d858738d36addd8320889e4a0e0 diff --git a/bootstrap b/bootstrap index 2a409fc..6910abf 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-01-16.17; # UTC +scriptversion=2012-01-21.16; # UTC # Bootstrap this package from checked-out sources. @@ -87,9 +87,9 @@ gnulib_files= : ${AUTOPOINT=autopoint} : ${AUTORECONF=autoreconf} -# A function to be called to edit gnulib.mk right after it's created. +# A function to be called right after gnulib-tool is run. # Override it via your own definition in bootstrap.conf. -gnulib_mk_hook() { :; } +bootstrap_post_import_hook() { :; } # A function to be called after everything else in this script. # Override it via your own definition in bootstrap.conf. @@ -807,6 +807,9 @@ for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file || exit done +bootstrap_post_import_hook \ + || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; } + # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. # The following requires GNU find 4.2.3 or newer. Considering the usual @@ -819,11 +822,16 @@ find "$m4_base" "$source_base" \ -depth \( -name '*.m4' -o -name '*.[ch]' \) \ -type l -xtype l -delete > /dev/null 2>&1 -# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. +# Some systems (RHEL 5) are using ancient autotools, for which the +# --no-recursive option had not been invented. Detect that lack and +# omit the option when it's not supported. FIXME in 2017: remove this +# hack when RHEL 5 autotools are updated, or when they become irrelevant. no_recursive= case $($AUTORECONF --help) in *--no-recursive*) no_recursive=--no-recursive;; esac + +# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. echo "running: AUTOPOINT=true LIBTOOLIZE=true " \ "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" AUTOPOINT=true LIBTOOLIZE=true \ -- 1.7.7.6