conflict between 'canonicalize' and 'canonicalize-lgpl'

[Bruno Haible]

The modules 'canonicalize' and 'canonicalize-lgpl' each provide a function
canonicalize_file_name().

On HP-UX, when building all of gnulib, the linker complains because it doesn't
know which object file inside libgnu.a to choose:

  /usr/ccs/bin/ld: Duplicate symbol "canonicalize_file_name" in files 
../gllib/libgnu.a(canonicalize.o) and ../gllib/libgnu.a(canonicalize-lgpl.o)
  /usr/ccs/bin/ld: Found 1 duplicate symbol(s)
  *** Error exit code 1

This should fix it.


2008-04-13  Bruno Haible  <address@hidden>

        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.

--- lib/canonicalize-lgpl.c.orig        2008-04-13 22:37:54.000000000 +0200
+++ lib/canonicalize-lgpl.c     2008-04-13 22:37:20.000000000 +0200
@@ -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>