[or-cvs] r16028: Do not build with openbsd's malloc unless enable-openbsd-mal (tor/trunk/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-07-17 15:37:52 -0400 (Thu, 17 Jul 2008)
New Revision: 16028

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/rules
Log:
Do not build with openbsd's malloc unless enable-openbsd-malloc is in DEB_BUILD_OPTIONS

Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2008-07-17 19:33:09 UTC (rev 16027)
+++ tor/trunk/debian/changelog	2008-07-17 19:37:52 UTC (rev 16028)
@@ -1,3 +1,10 @@
+tor (0.2.1.X-alpha-X) Xxperimental; urgency=low
+
+  * Do not build with openbsd's malloc unless enable-openbsd-malloc is in
+    DEB_BUILD_OPTIONS.
+
+ -- Peter Palfrader <weasel at debian.org>  Thu, 17 Jul 2008 21:37:14 +0200
+
 tor (0.2.1.2-alpha-1) experimental; urgency=low
 
   * New alpha release.

Modified: tor/trunk/debian/rules
===================================================================
--- tor/trunk/debian/rules	2008-07-17 19:33:09 UTC (rev 16027)
+++ tor/trunk/debian/rules	2008-07-17 19:37:52 UTC (rev 16028)
@@ -59,8 +59,8 @@
 ifneq (,$(findstring with-dmalloc,$(DEB_BUILD_OPTIONS)))
 	CONF_OPTIONS += --with-dmalloc
 endif
-# inhibit building with --enable-openbsd-malloc
-ifeq (,$(findstring no-enable-openbsd-malloc,$(DEB_BUILD_OPTIONS)))
+# allow building with --enable-openbsd-malloc
+ifneq (,$(findstring enable-openbsd-malloc,$(DEB_BUILD_OPTIONS)))
 	CONF_OPTIONS += --enable-openbsd-malloc
 endif