Index: Makefile.in
===================================================================
--- Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -281,4 +281,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -306,4 +307,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ benchmark/Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -231,4 +231,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -256,4 +257,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
Index: configure
===================================================================
--- configure	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ configure	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -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
Index: configure.ac
===================================================================
--- configure.ac	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ configure.ac	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -133,4 +133,8 @@
 	enable_gprofiler=$enableval, enable_gprofiler=yes)
 
+AC_ARG_ENABLE(demangler,
+	[  --enable-demangler     whether or not to build the demangler (executable and library)],
+	enable_demangler=$enableval, enable_demangler=yes)
+
 AC_SUBST(TARGET_HOSTS, ${target_hosts})
 
@@ -205,4 +209,15 @@
 AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBTCMALLOC" -eq 1])
 
+# conditionnally build the demangler
+if test "x$enable_demangler" == xyes; then
+	LIBDEMANGLE="libdemangle.a"
+	DEMANGLER="demangler"
+else
+	LIBDEMANGLE=""
+	DEMANGLER=""
+fi
+AC_SUBST([LIBDEMANGLE])
+AC_SUBST([DEMANGLER])
+
 # Checks for header files.
 AC_CHECK_HEADERS([libintl.h malloc.h unistd.h], [], [echo "Error: Missing required header"; exit 1])
Index: driver/Makefile.in
===================================================================
--- driver/Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ driver/Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -218,4 +218,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -243,4 +244,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
Index: longrun_tests/Makefile.in
===================================================================
--- longrun_tests/Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ longrun_tests/Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -365,4 +365,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -390,4 +391,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ src/Makefile.am	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -62,5 +62,6 @@
 # put into lib for now
 cfa_cpplibdir = $(CFA_LIBDIR)
-cfa_cpplib_PROGRAMS = ../driver/cfa-cpp demangler
+cfa_cpplib_PROGRAMS = ../driver/cfa-cpp $(DEMANGLER)
+EXTRA_PROGRAMS = demangler
 ___driver_cfa_cpp_SOURCES = $(SRC)
 ___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
@@ -74,5 +75,6 @@
 demangler_LDADD = libdemangle.a -ldl			# yywrap
 
-noinst_LIBRARIES = libdemangle.a
+noinst_LIBRARIES = $(LIBDEMANGLE)
+EXTRA_LIBRARIES = libdemangle.a
 libdemangle_a_SOURCES = $(SRCDEMANGLE)
 
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ src/Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -141,5 +141,6 @@
 build_triplet = @build@
 host_triplet = @host@
-cfa_cpplib_PROGRAMS = ../driver/cfa-cpp$(EXEEXT) demangler$(EXEEXT)
+cfa_cpplib_PROGRAMS = ../driver/cfa-cpp$(EXEEXT) $(DEMANGLER)
+EXTRA_PROGRAMS = demangler$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -427,4 +428,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -452,4 +454,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -703,5 +706,6 @@
 demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
 demangler_LDADD = libdemangle.a -ldl			# yywrap
-noinst_LIBRARIES = libdemangle.a
+noinst_LIBRARIES = $(LIBDEMANGLE)
+EXTRA_LIBRARIES = libdemangle.a
 libdemangle_a_SOURCES = $(SRCDEMANGLE)
 all: $(BUILT_SOURCES)
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ tests/Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -235,4 +235,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -260,4 +261,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
Index: tools/Makefile.in
===================================================================
--- tools/Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ tools/Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -225,4 +225,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -250,4 +251,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
Index: tools/prettyprinter/Makefile.in
===================================================================
--- tools/prettyprinter/Makefile.in	(revision 0d92e5c9f8a21c6e4fcc64a40b59c727c60f5934)
+++ tools/prettyprinter/Makefile.in	(revision df8b87cd9365d6524523f96a72d7c7b83f13b735)
@@ -254,4 +254,5 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -279,4 +280,5 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@