From: Eric Blake Date: Fri, 27 May 2016 20:04:35 +0000 (-0600) Subject: canonicalize: Fix broken probe for realpath. X-Git-Tag: v1.0~6736 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=246b3b28808ee5f4664be674dce573af9497fc7a;p=gnulib.git 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 --- diff --git a/ChangeLog b/ChangeLog index 6e3bb111e6..2d5a5487ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-05-27 Eric Blake + + 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 unsetenv: relax to LGPLv2+ diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index bfc9ebe3ad..cbbf3e2672 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], { 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);