From: Bruno Haible <bruno@clisp.org>
Date: Sun, 13 Apr 2008 20:39:41 +0000 (+0200)
Subject: Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl'.
X-Git-Tag: v0.1~7552
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=6a157512e5aaa7b6db14014d082a8ddeca3600b4;p=gnulib.git

Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl'.
---

diff --git a/ChangeLog b/ChangeLog
index 60de28f53..5b205be0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-04-13  Bruno Haible  <bruno@clisp.org>
 
+	Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl'.
+	* lib/canonicalize-lgpl.c: Elide the contents if the 'canonicalize'
+	module is also used and while not building the reloc-wrapper.
+
+2008-04-13  Bruno Haible  <bruno@clisp.org>
+
 	* tests/test-getaddrinfo.c (simple): Ignore EAI_NODATA error.
 
 2008-04-13  Bruno Haible  <bruno@clisp.org>
diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 80bef72c1..7446dfdfe 100644
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -21,7 +21,7 @@
    <stdlib.h> on Solaris 2.5.1.  */
 #undef realpath
 
-#if !HAVE_CANONICALIZE_FILE_NAME || defined _LIBC
+#if !(HAVE_CANONICALIZE_FILE_NAME || (GNULIB_CANONICALIZE && !defined IN_RELOCWRAPPER)) || defined _LIBC
 
 #include <alloca.h>