Mercurial > gnulib
changeset 18322:577b11c640ea
canonicalize: Fix broken probe for realpath.
Noticed in libvirt due to rpl_canonicalize being compiled on
glibc where it used to rely on the libc version.
* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Fix regression
in logic introduced in 54615b95.
Signed-off-by: Eric Blake <eblake@redhat.com>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Fri, 27 May 2016 14:04:35 -0600 |
| parents | 0b5b4068adfe |
| children | 3b9fb0246d6b |
| files | ChangeLog m4/canonicalize.m4 |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 26 08:47:27 2016 -0600 +++ b/ChangeLog Fri May 27 14:04:35 2016 -0600 @@ -1,3 +1,9 @@ +2016-05-27 Eric Blake <eblake@redhat.com> + + canonicalize: Fix broken probe for realpath. + * m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Fix regression + in logic introduced in 54615b95. + 2016-05-26 Eric Blake <eblake@redhat.com> unsetenv: relax to LGPLv2+
--- a/m4/canonicalize.m4 Thu May 26 08:47:27 2016 -0600 +++ b/m4/canonicalize.m4 Fri May 27 14:04:35 2016 -0600 @@ -1,4 +1,4 @@ -# canonicalize.m4 serial 27 +# canonicalize.m4 serial 28 dnl Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc. @@ -100,7 +100,7 @@ { char *name1 = realpath (".", NULL); char *name2 = realpath ("conftest.d//./..", NULL); - if (! (name1 && name2 && strcmp (name1, name2) != 0)) + if (! name1 || ! name2 || strcmp (name1, name2)) result |= 8; free (name1); free (name2);