[libvirt] [PATCHv2 1/6] build: update to latest gnulib

[Eric Blake]

* .gnulib: Update, for bootstrap and other fixes.
* bootstrap: Resynchronize with gnulib.
---

v2: not sure I've sent a v1 on list, so this is a new patch

* .gnulib 64a5e38...a2b658c (23):
  > intprops: add doc
  > verify: add doc to gnulib manual and fix example
  > warnings.m4: don't usurp save_CPPFLAGS variable name
  > ChangeLog: s/^        /\t/
  > doc: fix typo
  > doc: Tweak recent change.
  > inttypes: avoid autoconf warning
  > Typo.
  > vc-list-files: accept multiple directory operands
  > Fix confusion regarding deprecated modules.
  > doc: List the target platforms.
  > * build-aux/bootstrap (gnulib_tool): Handle symlink timestamps better.
  > intprops-tests: new module
  > intprops: add safe, portable integer overflow checking
  > fnmatch: add a test for glibc's Bugzilla bug #12378
  > fnmatch: sync glibc change fixing Bugzilla bug #12378
  > update from texinfo
  > getcwd-lgpl: relax test for FreeBSD
  > test-fflush: silence compiler warning
  > canonicalize, canonicalize-lgpl: Avoid crash dialog on MacOS X.
  > group-member: Declare function in <unistd.h>.
  > group-member: Document module.
  > fclose: Fix mistake earlier today.

 .gnulib   |    2 +-
 bootstrap |   12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gnulib b/.gnulib
index 64a5e38..a2b658c 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 64a5e38bced6c8f5117efbed95cdfd8ca133ed54
+Subproject commit a2b658cdccd4a13a5cef87144447f96cd1079e8c
diff --git a/bootstrap b/bootstrap
index d32db57..522ac70 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-05-11.17; # UTC
+scriptversion=2011-05-16.16; # UTC

 # Bootstrap this package from checked-out sources.

@@ -670,10 +670,18 @@ symlink_to_dir()
         cp -fp "$src" "$dst"
       }
     else
+      # Leave any existing symlink alone, if it already points to the source,
+      # so that broken build tools that care about symlink times
+      # aren't confused into doing unnecessary builds.  Conversely, if the
+      # existing symlink's time stamp is older than the source, make it afresh,
+      # so that broken tools aren't confused into skipping needed builds.  See
+      # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
       test -h "$dst" &&
       src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
       dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
-      test "$src_i" = "$dst_i" || {
+      test "$src_i" = "$dst_i" &&
+      both_ls=`ls -dt "$src" "$dst"` &&
+      test "X$both_ls" = "X$dst$nl$src" || {
         dot_dots=
         case $src in
         /*) ;;
-- 
1.7.4.4