From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 22 Feb 2011 11:39:23 +0000 (+0000)
Subject: Don't disable GLib assertions when disabling our own assertions
X-Git-Tag: dbus-1.4.12~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77e208ac1da8f5840270207a31170a15b8d562f2;p=thirdparty%2Fdbus.git

Don't disable GLib assertions when disabling our own assertions

We no longer use GLib internally, and assertions are how it'll report test
failures when we add GTest-based tests.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570
---

diff --git a/configure.ac b/configure.ac
index 64db54234..c4bc0503b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,7 +164,6 @@ fi
 
 if test x$enable_asserts = xno; then
     AC_DEFINE(DBUS_DISABLE_ASSERT,1,[Disable assertion checking])
-    AC_DEFINE(G_DISABLE_ASSERT,1,[Disable GLib assertion macros])
     R_DYNAMIC_LDFLAG=""
 else
     # -rdynamic is needed for glibc's backtrace_symbols to work.