]> Savannah Git Hosting - gnulib.git/commitdiff
canonicalize: Fix broken probe for realpath.
authorEric Blake <eblake@redhat.com>
Fri, 27 May 2016 20:04:35 +0000 (14:04 -0600)
committerEric Blake <eblake@redhat.com>
Fri, 27 May 2016 20:04:35 +0000 (14:04 -0600)
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>
ChangeLog
m4/canonicalize.m4

index 6e3bb111e6bf6c1a1ce64d9254f603a2710a12a0..2d5a5487ff2ab5a1e7e31a981ad8d89512f9341d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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+
index bfc9ebe3ad52625e558cdf1c3be9a3e1a7441e20..cbbf3e26724eb44a52229a2b6e43f8dc3c606da0 100644 (file)
@@ -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);