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

diff --git a/ChangeLog b/ChangeLog
index 60de28f53d00f0d7568aebd7a8d1f2e99d3bb4fc..5b205be0a3cd70edbb2563be279a2c4aa85fb154 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 80bef72c16ab4d518a29261c65ab30ce8467bddf..7446dfdfe94d4ad0ed500de133fd1129c37dd441 100644 (file)
--- 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>