From 1ce4a45932cd01f0e8096f636adaa684b6f5c7cb Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Sun, 3 May 2015 21:14:09 +0300 Subject: [PATCH] configure: fix enable_demangler setting Add missing comma to AS_IF, otherwise enable_demangler is always set to 'no'. Canonicalize tests. Signed-off-by: Max Filippov --- 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 + + * configure.ac (DEMANGLE): Fix enable_demangler setting. + 2015-05-01 Mark Wielaard * 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], -- 2.7.4