From b14df8bec02a614c57f203e715cfbcd178a151f8 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Wed, 17 Aug 2011 18:12:53 -0600
Subject: [PATCH] build: fix compilation on mingw64

* .gnulib: Update to latest, for getcwd fixes.
* bootstrap: Resync to gnulib.
---
 .gnulib   |  2 +-
 bootstrap | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.gnulib b/.gnulib
index 4470580881..a6b16b69fe 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 4470580881a7b821b52fb5635102ef3e27aa5af4
+Subproject commit a6b16b69fe1cad695b270dd5bf3deb2850fc4dd1
diff --git a/bootstrap b/bootstrap
index b286beb53f..f76db9aea2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-06-22.06; # UTC
+scriptversion=2011-08-11.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -800,20 +800,7 @@ slurp() {
         echo "$me: $dir/$file overrides $1/$dir/$file"
       else
         copied=$copied$sep$file; sep=$nl
-        if test $file = gettext.m4; then
-          echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
-          rm -f $dir/$file
-          sed '
-            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-              AC_DEFUN([AM_INTL_SUBDIR], [])
-            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
-              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
-            $a\
-              AC_DEFUN([gl_LOCK_EARLY], [])
-          ' $1/$dir/$file >$dir/$file
-        else
-          cp_mark_as_generated $1/$dir/$file $dir/$file
-        fi
+        cp_mark_as_generated $1/$dir/$file $dir/$file
       fi || exit
     done