gnulib: Use the fnmatch module.

As an added bonus, we can now remove the _GNU_SOURCE nonsense.

diff --git a/m4/.gitignore b/m4/.gitignore
index f8a49976e4f9c5db1923b7216c6af2cabe2bb463..ae1c38e06f78ca172d56c25ab8e5f99874d4af46 100644 (file)
--- 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 f2f03005df33b8f0dae1536adf9f816488a7c878..95df4a3f90eddab9801ed9e91326f1b0ff8fe28f 100644 (file)
--- 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 50dff078f7050588c595c60ad179a52785942706..fe7ab584fefc7bab8b5685bdf5ed9d58a2e789ed 100644 (file)
--- 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 e702587057082770eb3651add0684a689d330ab1..c76bdd6d8232921587211dcaee1335a766a4e651 100644 (file)
--- 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>