From 26c4a5db661e1c68982f0b474b52b33d38dc2b7a Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 9 May 2012 21:43:43 -0400
Subject: [PATCH] gnulib: Update to latest version.

---
 .gitignore         |  5 +----
 gnulib             |  2 +-
 m4/.gitignore      | 18 +++++++++++-------
 m4/gnulib-cache.m4 | 25 +++++++++++++++++++------
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a6c309..f6ee610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,5 @@ Makefile.in
 /compile
 /libuobject.pc
 /lib
-/link-warning.h
-/warn-on-use.h
-/arg-nonnull.h
-/c++defs.h
+/snippet
 /test-suite.log
diff --git a/gnulib b/gnulib
index 24e2507..aa3de1a 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 24e25070c5f5f3c9e1008290c63c9f03836c82ff
+Subproject commit aa3de1af836fb58f4d28214154afc804e85e49f9
diff --git a/m4/.gitignore b/m4/.gitignore
index ac2ed35..f6d1341 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,20 +1,24 @@
-ltdl.m4
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-libtool.m4
-argz.m4
 00gnulib.m4
+argz.m4
 extensions.m4
 getopt.m4
 gnulib-common.m4
 gnulib-comp.m4
 gnulib-tool.m4
 include_next.m4
+libtool.m4
+ltdl.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
+nocrash.m4
+off_t.m4
+ssize_t.m4
 stddef_h.m4
 strcase.m4
 strings_h.m4
+sys_types_h.m4
 unistd_h.m4
 warn-on-use.m4
 wchar_t.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 1d39704..1869e41 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,9 +1,21 @@
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -15,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl --no-vc-files getopt-gnu strcase
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files getopt-gnu strcase
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -34,4 +46,5 @@ gl_MAKEFILE_NAME([])
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
+gl_WITNESS_C_DOMAIN([])
 gl_VC_FILES([false])
-- 
2.43.0