[or-cvs] If "with-dmalloc" is in DEB_BUILD_OPTIONS we build against ...

[weasel@xxxxxxxx (Peter Palfrader)]

Update of /home/or/cvsroot/tor/debian
In directory moria.mit.edu:/tmp/cvs-serv511/debian

Modified Files:
	changelog rules 
Log Message:
If "with-dmalloc" is in DEB_BUILD_OPTIONS we build against libdmalloc4.

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/tor/debian/changelog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- changelog	22 Mar 2005 21:53:34 -0000	1.101
+++ changelog	22 Mar 2005 22:38:21 -0000	1.102
@@ -9,6 +9,8 @@
   * 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@xxxxxxxxxx>  Tue, 22 Mar 2005 22:32:08 +0100
 

Index: rules
===================================================================
RCS file: /home/or/cvsroot/tor/debian/rules,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- rules	8 Dec 2004 14:21:59 -0000	1.16
+++ rules	22 Mar 2005 22:38:21 -0000	1.17
@@ -41,6 +41,12 @@
 	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 @@
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--localstatedir=/var \
-		--sysconfdir=/etc
+		--sysconfdir=/etc \
+		$(CONF_OPTIONS)
 
 
 build: build-stamp