[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] canonicalize: Fix broken probe for realpath.
From: |
Eric Blake |
Subject: |
[PATCH] canonicalize: Fix broken probe for realpath. |
Date: |
Fri, 27 May 2016 14:05:49 -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 <address@hidden>
---
ChangeLog | 6 ++++++
m4/canonicalize.m4 | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6e3bb11..2d5a548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-27 Eric Blake <address@hidden>
+
+ 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 <address@hidden>
unsetenv: relax to LGPLv2+
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index bfc9ebe..cbbf3e2 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);
--
2.5.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] canonicalize: Fix broken probe for realpath.,
Eric Blake <=