Mercurial > hg > octave-shane > gnulib-hg
changeset 9955:288822bd74b0
Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl' differently.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 22 Apr 2008 00:01:17 +0200 |
| parents | 0f61f5040489 |
| children | 148c76830fd2 |
| files | ChangeLog lib/canonicalize-lgpl.c lib/canonicalize.c modules/canonicalize-lgpl |
| diffstat | 4 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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>
--- 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.