If "with-dmalloc" is in DEB_BUILD_OPTIONS we build against libdmalloc4.

svn:r3821

2 files changed, 10 insertions, 1 deletions

diff --git a/changelog b/changelog
index 3cf532c90a..1f2e5534a6 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ tor (0.1.0.0-alpha-cvs-1) UNRELEASED; urgency=low
   * Add a snippet to set nice level in etc/default/tor.
   * Wait for 60 seconds in init stop.  35 is too little.
   * Don't depend on python anymore - tor-resolve is C now.
+  * If "with-dmalloc" is in DEB_BUILD_OPTIONS we build against libdmalloc4.
+    Of course the -dev package needs to be installed.
 
  -- Peter Palfrader <weasel@debian.org>  Tue, 22 Mar 2005 22:32:08 +0100
 
diff --git a/rules b/rules
index c248290929..b9eee7d20c 100755
--- a/rules
+++ b/rules
@@ -41,6 +41,12 @@ ifneq (,$(findstring notest,$(DEB_BUILD_OPTIONS)))
 	RUN_TEST = no
 endif
 
+CONF_OPTIONS =
+# build against libdmalloc4 - it better be installed
+ifneq (,$(findstring with-dmalloc,$(DEB_BUILD_OPTIONS)))
+	CONF_OPTIONS += --with-dmalloc
+endif
+
 configure: patch-stamp
 config.status: configure
 	dh_testdir
@@ -51,7 +57,8 @@ config.status: configure
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--localstatedir=/var \
-		--sysconfdir=/etc
+		--sysconfdir=/etc \
+		$(CONF_OPTIONS)
 
 
 build: build-stamp