From 548f5563f2abaf3f835038fe3a40d8d4f2a3b751 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 3 Feb 2010 23:51:32 -0500
Subject: [PATCH] gnulib: Use the fnmatch module.

As an added bonus, we can now remove the _GNU_SOURCE nonsense.
---
 m4/.gitignore      | 20 ++++++++++++++++++++
 m4/gnulib-cache.m4 |  3 ++-
 src/lbximg.c       |  1 -
 src/lbxtool.c      |  1 -
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/m4/.gitignore b/m4/.gitignore
index f8a4997..ae1c38e 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -15,3 +15,23 @@ stddef_h.m4
 unistd_h.m4
 warn-on-use.m4
 wchar_t.m4
+alloca.m4
+codeset.m4
+fcntl-o.m4
+fnmatch.m4
+glibc21.m4
+localcharset.m4
+locale-fr.m4
+locale-ja.m4
+locale-zh.m4
+mbrtowc.m4
+mbsinit.m4
+mbsrtowcs.m4
+mbstate_t.m4
+memchr.m4
+mmap-anon.m4
+stdbool.m4
+string_h.m4
+wchar.m4
+wctype.m4
+wint_t.m4
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index f2f0300..95df4a3 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,11 +15,12 @@
 
 
 # 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
+#   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 fnmatch getopt-gnu
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
+  fnmatch
   getopt-gnu
 ])
 gl_AVOID([])
diff --git a/src/lbximg.c b/src/lbximg.c
index 50dff07..fe7ab58 100644
--- a/src/lbximg.c
+++ b/src/lbximg.c
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _GNU_SOURCE
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/lbxtool.c b/src/lbxtool.c
index e702587..c76bdd6 100644
--- a/src/lbxtool.c
+++ b/src/lbxtool.c
@@ -16,7 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _GNU_SOURCE
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
2.43.2