summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a11c6d4..f727bf2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-03 Max Filippov <[email protected]>
+
+ * configure.ac (DEMANGLE): Fix enable_demangler setting.
+
2015-05-01 Mark Wielaard <[email protected]>
* configure.ac (DEMANGLE): Explicitly set enable_demangler.
diff --git a/configure.ac b/configure.ac
index 0ba3db36..7ba4d115 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],