From 8ecf5bd3751ab749c9c78749cecd4599091df3bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 19 Apr 2009 23:22:32 +0200
Subject: [PATCH] Update to current Gnulib.

Update to today's Gnulib, commit
32bdc9d13095a91c492bb581212b6c078e5cae46,
Sun Apr 19 22:09:56 2009 +0200.

* m4/gnulib-cache.m4: Add `striconveh'.

* src/bytevector.c: Include <striconveh.h>, for `mem_iconveh ()'.
---
 m4/.gitignore      |  3 +++
 m4/gnulib-cache.m4 | 17 ++++++++++++++---
 src/bytevector.c   |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/m4/.gitignore b/m4/.gitignore
index f7bee84..02d2cac 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -30,3 +30,6 @@ stdlib_h.m4
 unistd_h.m4
 /libtool.m4
 /lt*.m4
+/00gnulib.m4
+/multiarch.m4
+/wint_t.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index f90c611..0f044c6 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
@@ -15,11 +15,22 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=lgl --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl byteswap iconv_open-utf string uniconv/u16-strconv-from-locale uniconv/u16-strconv-to-locale uniconv/u32-strconv-from-locale uniconv/u32-strconv-to-locale uniconv/u8-strconv-from-locale uniconv/u8-strconv-to-locale
+#   gnulib-tool --import --dir=. --local-dir=lgl --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl byteswap iconv_open-utf striconveh string uniconv/u16-strconv-from-locale uniconv/u16-strconv-to-locale uniconv/u32-strconv-from-locale uniconv/u32-strconv-to-locale uniconv/u8-strconv-from-locale uniconv/u8-strconv-to-locale
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([lgl])
-gl_MODULES([byteswap iconv_open-utf string uniconv/u16-strconv-from-locale uniconv/u16-strconv-to-locale uniconv/u32-strconv-from-locale uniconv/u32-strconv-to-locale uniconv/u8-strconv-from-locale uniconv/u8-strconv-to-locale])
+gl_MODULES([
+  byteswap
+  iconv_open-utf
+  striconveh
+  string
+  uniconv/u16-strconv-from-locale
+  uniconv/u16-strconv-to-locale
+  uniconv/u32-strconv-from-locale
+  uniconv/u32-strconv-to-locale
+  uniconv/u8-strconv-from-locale
+  uniconv/u8-strconv-to-locale
+])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
diff --git a/src/bytevector.c b/src/bytevector.c
index f7f0c4b..e6f722d 100644
--- a/src/bytevector.c
+++ b/src/bytevector.c
@@ -25,6 +25,7 @@
 #include "bytevector.h"
 #include "ieee-754.h"
 #include "uniconv.h"
+#include "striconveh.h"
 #include "utils.h"
 
 #include <byteswap.h>
-- 
2.11.4.GIT