[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: fnmatch: remove incompatibility between fnmatch-posix and fnmatch-gn

From: Simon Josefsson
Subject: Re: fnmatch: remove incompatibility between fnmatch-posix and fnmatch-gnu
Date: Mon, 04 May 2009 00:04:50 +0200
User-agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.93 (gnu/linux)

Bruno Haible <address@hidden> writes:

> We had a long-standing incompatibility between the modules fnmatch-gnu and
> fnmatch-posix: It was not possible to both in the same configure.ac. This
> fixes it.

It fails to build because config.h contains:

#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch

I've pushed the patch below to fix it.


>From 4f3ac4cd01d5dbfb002d8d1dd2788514efc881e1 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Mon, 4 May 2009 00:04:23 +0200
Subject: [PATCH] m4/fnmatch.m4: Fix fnmatch re-define.

 ChangeLog     |    4 ++++
 m4/fnmatch.m4 |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d89efb..5f552f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-04  Simon Josefsson  <address@hidden>
+       * m4/fnmatch.m4: Fix fnmatch re-define.
 2009-04-27  David Bartley  <address@hidden>
        priv-set: new module and tests; adapt write-any-file
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 93ec2b3..9481a10 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -101,7 +101,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
     dnl We must choose a different name for our function, since on ELF systems
     dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
     dnl compiled into a shared library.
-    AC_DEFINE([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
+    AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
       [Define to a replacement function name for fnmatch().])
     dnl Prerequisites of lib/fnmatch.c.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]