From 54d4211caea3769ac0e1e9b79212a53dea97cd68 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 4 Mar 2011 16:07:48 +0000
Subject: [PATCH 4/4] Replace vestigial efence support with --with-dbus-daemon-malloc

---
 bus/Makefile.am          |   16 ++++++++++------
 cmake/bus/CMakeLists.txt |    1 -
 configure.ac             |   10 ++++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index efa8ab5..7733f33 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -5,8 +5,6 @@ INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@		\
 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
 	-DDBUS_COMPILATION
 
-EFENCE=
-
 CONFIG_IN_FILES=				\
 	session.conf.in				\
 	system.conf.in				\
@@ -85,8 +83,8 @@ dbus_daemon_SOURCES=				\
 dbus_daemon_CPPFLAGS = -DDBUS_STATIC_BUILD
 dbus_daemon_LDADD=					\
 	$(top_builddir)/dbus/libdbus-internal.la	\
-	$(EFENCE)					\
-	$(DBUS_BUS_LIBS)
+	$(DBUS_BUS_LIBS)				\
+	$(DBUS_DAEMON_MALLOC)
 
 dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
 
@@ -182,7 +180,10 @@ bus_test_system_SOURCES=			\
 	test-system.c
 
 bus_test_system_CPPFLAGS = -DDBUS_STATIC_BUILD
-bus_test_system_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
+bus_test_system_LDADD = \
+	$(top_builddir)/dbus/libdbus-internal.la \
+	$(DBUS_BUS_LIBS) \
+	$(DBUS_DAEMON_MALLOC)
 bus_test_system_LDFLAGS=@R_DYNAMIC_LDFLAG@
 
 bus_test_SOURCES=				\
@@ -190,7 +191,10 @@ bus_test_SOURCES=				\
 	test-main.c
 
 bus_test_CPPFLAGS = -DDBUS_STATIC_BUILD
-bus_test_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_BUS_LIBS)
+bus_test_LDADD = \
+	$(top_builddir)/dbus/libdbus-internal.la \
+	$(DBUS_BUS_LIBS) \
+	$(DBUS_DAEMON_MALLOC)
 bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
 
 ## mop up the gcov files
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 876be81..7653dd9 100644
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -2,7 +2,6 @@ project(bus)
 
 add_definitions(-DDBUS_COMPILATION)
 
-SET(EFENCE "")
 SET(BUS_DIR ${CMAKE_SOURCE_DIR}/../bus)
 
 set (config_DATA
diff --git a/configure.ac b/configure.ac
index 51fe332..2b6b8ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1622,6 +1622,16 @@ AH_VERBATIM(_DARWIN_ENVIRON,
 #endif
 ])
 
+AC_ARG_WITH([dbus-daemon-malloc],
+  [AS_HELP_STRING([--with-dbus-daemon-malloc=[linker flags]],
+    [a malloc implementation (e.g. jemalloc or efence) for dbus-daemon])],
+  [], [with_dbus_daemon_malloc=no])
+DBUS_DAEMON_MALLOC=$with_dbus_daemon_malloc
+if test "x$DBUS_DAEMON_MALLOC" = xno; then
+  DBUS_DAEMON_MALLOC=
+fi
+AC_SUBST([DBUS_DAEMON_MALLOC])
+
 AC_ARG_ENABLE([message-cache],
   [AS_HELP_STRING([--disable-message-cache],
     [disable the global DBusMessage cache])],
-- 
1.7.4.1