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

svn:r3821

diff --git a/debian/changelog b/debian/changelog
index 3cf532c90aa148e5e4e455caee94123ded7a5f53..1f2e5534a64e2a2e94ad44bc5267a265a3b927b3 100644 (file)
--- a/debian/changelog
+++ b/debian/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/debian/rules b/debian/rules
index c248290929781b9b02e0a4c98d68279125009eea..b9eee7d20c15cc532a1106da6b0112e11c3fdd60 100755 (executable)
--- a/debian/rules
+++ b/debian/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