Index: configure
===================================================================
--- configure	(revision d82892a91ee391c4b1f081a7e5c8216c409a7a4d)
+++ configure	(revision 913be78682d1b2583cedfb37a4228c4140583fd4)
@@ -637,4 +637,6 @@
 LIBOBJS
 CFA_BACKEND_CC
+DEMANGLER
+LIBDEMANGLE
 WITH_LIBTCMALLOC_FALSE
 WITH_LIBTCMALLOC_TRUE
@@ -797,4 +799,5 @@
 with_target_hosts
 enable_gprofiler
+enable_demangler
 enable_dependency_tracking
 enable_shared
@@ -1457,4 +1460,5 @@
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-gprofiler     whether or not to enable gprofiler tools (if available)
+  --enable-demangler     whether or not to build the demangler (executable and library)
   --enable-dependency-tracking
                           do not reject slow dependency extractors
@@ -3398,4 +3402,12 @@
 else
   enable_gprofiler=yes
+fi
+
+
+# Check whether --enable-demangler was given.
+if test "${enable_demangler+set}" = set; then :
+  enableval=$enable_demangler; enable_demangler=$enableval
+else
+  enable_demangler=yes
 fi
 
@@ -16780,4 +16792,15 @@
 
 
+# conditionnally build the demangler
+if test "x$enable_demangler" == xyes; then
+	LIBDEMANGLE="libdemangle.a"
+	DEMANGLER="demangler"
+else
+	LIBDEMANGLE=""
+	DEMANGLER=""
+fi
+
+
+
 # Checks for header files.
 for ac_header in libintl.h malloc.h unistd.h