From: Bruno Haible <bruno@clisp.org>
Date: Sat, 23 Aug 2003 15:21:59 +0000 (+0000)
Subject: Use module 'fnmatch' from gnulib.
X-Git-Tag: v0.13~344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ee9a879c242deb5097434887a0306060bf63986;p=thirdparty%2Fgettext.git

Use module 'fnmatch' from gnulib.
---

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 0c8f25d9a..55506c606 100644
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,19 @@
+2003-08-23  Bruno Haible  <bruno@clisp.org>
+
+	* fnmatch_.h: Renamed from pfnmatch.h.
+	* fnmatch.c: Renamed from pfnmatch.c.
+	* Makefile.am (LIBADD_SOURCE): Remove pfnmatch.h, pfnmatch.c, add
+	fnmatch.c.
+	(EXTRA_DIST): Add fnmatch_.h.
+	(all-local): Depend on fnmatch.h.
+	(fnmatch.h): New rule.
+	(MOSTLYCLEANFILES): Add fnmatch.h.
+	* Makefile.msvc (OBJECTS): Remove pfnmatch.obj, add fnmatch.obj.
+	(fnmatch.obj): Renamed from pfnmatch.obj.
+	* Makefile.vms (OBJECTS): Remove pfnmatch.obj, add fnmatch.obj.
+	(fnmatch.h): Update rule.
+	(fnmatch.obj): Renamed from pfnmatch.obj.
+
 2003-07-01  Paul Eggert  <eggert@twinsun.com>
 
 	* xreadlink.c: Include <sys/types.h> unconditionally, instead of
diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 47fbbef0c..4bee8ae5c 100644
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -77,11 +77,11 @@ libgettextlib_la_SOURCES = \
 LIBADD_SOURCE = \
   alloca.c \
   canonicalize.h canonicalize.c \
+  fnmatch.c \
   getline.h getline.c \
   memmove.c \
   memset.c \
   mkdtemp.h mkdtemp.c \
-  pfnmatch.h pfnmatch.c \
   readlink.c \
   relocatable.h relocatable.c \
   setenv.h setenv.c unsetenv.c \
@@ -160,6 +160,18 @@ MOSTLYCLEANFILES += alloca.h
 # <<< gnulib module alloca.
 
 
+# >>> gnulib module fnmatch.
+EXTRA_DIST += fnmatch_.h
+
+# The following is needed in order to create an <fnmatch.h> when the system
+# doesn't have one that works.
+all-local $(libgettextlib_la_OBJECTS): @FNMATCH_H@
+fnmatch.h: fnmatch_.h
+	cp $(srcdir)/fnmatch_.h fnmatch.h
+MOSTLYCLEANFILES += fnmatch.h
+# <<< gnulib module fnmatch.
+
+
 # >>> gnulib module localcharset.
 libgettextlib_la_SOURCES += localcharset.h localcharset.c
 EXTRA_DIST += config.charset ref-add.sin ref-del.sin
diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc
index db287354b..593e81245 100644
--- a/gettext-tools/lib/Makefile.msvc
+++ b/gettext-tools/lib/Makefile.msvc
@@ -113,9 +113,9 @@ OBJECTS = \
   xmalloc.obj xstrdup.obj \
   xsetenv.obj \
   \
+  fnmatch.obj \
   getline.obj \
   mkdtemp.obj \
-  pfnmatch.obj \
   relocatable.obj \
   setenv.obj unsetenv.obj \
   stpcpy.obj \
@@ -240,15 +240,15 @@ xstrdup.obj : xstrdup.c
 xsetenv.obj : xsetenv.c
 	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c xsetenv.c
 
+fnmatch.obj : fnmatch.c
+	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c fnmatch.c
+
 getline.obj : getline.c
 	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c getline.c
 
 mkdtemp.obj : mkdtemp.c
 	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c mkdtemp.c
 
-pfnmatch.obj : pfnmatch.c
-	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c pfnmatch.c
-
 relocatable.obj : relocatable.c
 	$(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c relocatable.c
 
diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms
index 6c8dd9cf8..b6a9443dd 100644
--- a/gettext-tools/lib/Makefile.vms
+++ b/gettext-tools/lib/Makefile.vms
@@ -71,9 +71,9 @@ OBJECTS = \
   xmalloc.obj, xstrdup.obj, \
   xsetenv.obj, \
   \
+  fnmatch.obj, \
   getline.obj, \
   mkdtemp.obj, \
-  pfnmatch.obj, \
   relocatable.obj, \
   stpcpy.obj, \
   vasprintf.obj
@@ -84,8 +84,8 @@ all : alloca.h,fnmatch.h,gettextlib.olb
 alloca.h : alloca_.h
 	$(LN) alloca_.h alloca.h
 
-fnmatch.h : pfnmatch.h
-	$(LN) pfnmatch.h fnmatch.h
+fnmatch.h : fnmatch_.h
+	$(LN) fnmatch_.h fnmatch.h
 
 argmatch.obj : argmatch.c
 	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) argmatch.c
@@ -201,15 +201,15 @@ xstrdup.obj : xstrdup.c
 xsetenv.obj : xsetenv.c
 	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xsetenv.c
 
+fnmatch.obj : fnmatch.c fnmatch.h
+	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) fnmatch.c
+
 getline.obj : getline.c
 	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) getline.c
 
 mkdtemp.obj : mkdtemp.c
 	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) mkdtemp.c
 
-pfnmatch.obj : pfnmatch.c fnmatch.h
-	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) pfnmatch.c
-
 relocatable.obj : relocatable.c
 	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) relocatable.c