Better fix for issue 1875: use -lsupc++ if required.

diff --git a/config.make.in b/config.make.in
index 93158d88f4e561d6eb827ac23c15160d8f05d5bf..3ed8e53b05b5dde9123bec6be15e7debf7ed5511 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -25,6 +25,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 GUILE_LIBS = @GUILE_LDFLAGS@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
+CXXABI_LIBS = @CXXABI_LIBS@
 
 CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
 CONFIG_LDFLAGS = @LDFLAGS@

diff --git a/configure.in b/configure.in
index 8dc4e5ca9734a7d12a6edad272710fe8b8afcf84..7a020d6e097fdef22e04ad16af6cc935f2da19a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -129,12 +129,22 @@ AC_CHECK_TYPES([scm_t_subr],
 CXXFLAGS="$save_CXXFLAGS"
 
 ## Check for usable cxxabi
+save_LIBS="$LIBS"
+LIBS="$LIBS $CXXABI_LIBS"
 AC_MSG_CHECKING(for usable C++ demangler)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
-           [abi::__cxa_demangle ("", 0, 0, 0)]);],
+           [abi::__cxa_demangle ("", 0, 0, 0)])],
     [AC_DEFINE(HAVE_CXA_DEMANGLE)
-AC_MSG_RESULT(yes)],
-    [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])
+       AC_MSG_RESULT(yes)],[
+       LIBS="$LIBS -lsupc++"
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
+                   [abi::__cxa_demangle ("", 0, 0, 0)])],
+           [AC_DEFINE(HAVE_CXA_DEMANGLE)
+               AC_MSG_RESULT([yes, using -lsupc++])
+               CXXABI_LIBS="$CXXABI_LIBS -lsupc++"],
+           [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])])
+LIBS="$save_LIBS"
+AC_SUBST(CXXABI_LIBS)
 
 ## check rational bugfix.
 save_CPPFLAGS="$CPPFLAGS"

diff --git a/stepmake/stepmake/test-vars.make b/stepmake/stepmake/test-vars.make
index ffd57d480be07b1c7288ae29dca4297304009563..b7feb78a1410b628c64dc93b0b1f4b3f584ba910 100644 (file)
--- a/stepmake/stepmake/test-vars.make
+++ b/stepmake/stepmake/test-vars.make
@@ -4,4 +4,4 @@ O_FILES := $(filter-out $(outdir)/test%, $(O_FILES))
 TEST_EXECUTABLE = $(outdir)/test-$(NAME)
 TEST_MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(TEST_MODULE_LIBS)))
 
-TEST_LOADLIBES = $(TEST_MODULE_LIBES) $(LOADLIBES)
+TEST_LOADLIBES = $(TEST_MODULE_LIBES) $(LOADLIBES) $(CXXABI_LIBS)