Re: [PATCH] configure: fix enable_demangler setting

Re: [PATCH] configure: fix enable_demangler setting

[Mark Wielaard]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

On Sun, May 03, 2015 at 09:14:09PM +0300, Max Filippov wrote:
> Add missing comma to AS_IF, otherwise enable_demangler is always set to
> 'no'. Canonicalize tests.

Thanks pushed.
I was sure I properly tested it.
But clearly it could never have worked before your fix.

Cheers,

Mark

[PATCH] configure: fix enable_demangler setting

[Max Filippov]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

Add missing comma to AS_IF, otherwise enable_demangler is always set to
'no'. Canonicalize tests.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 ChangeLog    | 4 ++++
 configure.ac | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a11c6d..f727bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-03  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* configure.ac (DEMANGLE): Fix enable_demangler setting.
+
 2015-05-01  Mark Wielaard  <mjw@redhat.com>
 
 	* configure.ac (DEMANGLE): Explicitly set enable_demangler.
diff --git a/configure.ac b/configure.ac
index 0ba3db3..7ba4d11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,8 +234,8 @@ AC_SUBST([zip_LIBS])
 
 AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl
 AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
-AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)
-AS_IF([test "$ac_cv_lib_stdcpp___cxa_demangle" = yes]
+AM_CONDITIONAL(DEMANGLE, test "x$ac_cv_lib_stdcpp___cxa_demangle" = "xyes")
+AS_IF([test "x$ac_cv_lib_stdcpp___cxa_demangle" = "xyes"],
       [enable_demangler=yes],[enable_demangler=no])
 
 AC_ARG_ENABLE([textrelcheck],
-- 
1.8.1.4