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

diff --git a/ChangeLog b/ChangeLog
index cbbf085a4fdfcbbf41e4241900aa94e7f5116e81..3c5c979c44a068b8c34cc3abebb82921484bd097 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-20  Bruno Haible  <bruno@clisp.org>
+
+       Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl',
+       take 2.
+       * lib/canonicalize.c (canonicalize_file_name): Elide if the
+       'canonicalize-lgpl' module is also used.
+       * lib/canonicalize-lgpl.c: Undo last change.
+       * modules/canonicalize-lgpl (configure.ac): Invoke gl_MODULE_INDICATOR.
+
 2008-04-20  Bruno Haible  <bruno@clisp.org>
 
        * lib/mkdir.c (mkdir): Undefine after the includes, not right after

diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 7446dfdfe94d4ad0ed500de133fd1129c37dd441..80bef72c16ab4d518a29261c65ab30ce8467bddf 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 || (GNULIB_CANONICALIZE && !defined IN_RELOCWRAPPER)) || defined _LIBC
+#if !HAVE_CANONICALIZE_FILE_NAME || defined _LIBC
 
 #include <alloca.h>
 

diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index f0a4762b7899a7aae6e6c3549025a46e127df809..4f348398fd69ae516396313d18ac294a4ca3dde3 100644 (file)
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2007 Free Software Foundation, Inc.
+   Copyright (C) 1996-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@
 #include "pathmax.h"
 #include "areadlink.h"
 
-#if !HAVE_CANONICALIZE_FILE_NAME
+#if !(HAVE_CANONICALIZE_FILE_NAME || GNULIB_CANONICALIZE_LGPL)
 /* Return the canonical absolute name of file NAME.  A canonical name
    does not contain any `.', `..' components nor any repeated file name
    separators ('/') or symlinks.  All components must exist.

diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl
index 2514f4337760e8e24adca39c04d3a0526574db1b..129e813aaab1d41b1c00114bc9212902511dc2f7 100644 (file)
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -14,6 +14,7 @@ readlink
 
 configure.ac:
 gl_CANONICALIZE_LGPL
+gl_MODULE_INDICATOR([canonicalize-lgpl])
 
 Makefile.am: