There have been a couple of cases where demangler support has been
accidentially been disabled because libstdc++ wasn't there/installed
during build. Make it an error if --disable-demangler isn't explicitly
given.

Signed-off-by: Mark Wielaard <m...@klomp.org>
---
 ChangeLog    | 5 +++++
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a46cca6c..d99d837d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-02-15  Mark Wielaard  <m...@klomp.org>
+
+       * configure.ac: Error out when demangler is enabled, but
+       __cxa_demangle cannot be found.
+
 2023-01-11  Frank Ch. Eigler  <f...@redhat.com>
 
        * configure.ac: Add some rlimit/affinity checks.
diff --git a/configure.ac b/configure.ac
index 18951947..1ef45c0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,7 +498,8 @@ AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl
 AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
 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]),
+      [enable_demangler=yes],
+      [AC_MSG_ERROR([__cxa_demangle not found in libstdc++ use 
--disable-demangler to disable demangler support.])]),
 AM_CONDITIONAL(DEMANGLE, false))
 
 AC_ARG_ENABLE([textrelcheck],
-- 
2.39.1

Reply via email to