Do not build with openbsd's malloc unless enable-openbsd-malloc is in DEB_BUILD_OPTIONS

svn:r16028

diff --git a/debian/changelog b/debian/changelog
index b653e5d84ba1c5e2b44041fef58f5c5964b77328..0588b0dc89bea6fad8cd234a459c9626f8cb5893 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@debian.org>  Thu, 17 Jul 2008 21:37:14 +0200
+
 tor (0.2.1.2-alpha-1) experimental; urgency=low
 
   * New alpha release.

diff --git a/debian/rules b/debian/rules
index b3f2b0dadbaf96996854b952c8ded5592e6c4ff0..797d67ea5ae27a4453f9eb5c6923b25a05a6c307 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,8 +59,8 @@ CONF_OPTIONS =
 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