From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 11 Jul 2011 12:23:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/dbus-1.4'
X-Git-Tag: dbus-1.5.6~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ecd0a02b993685a456da58c5c03e2d3bab17d67;p=thirdparty%2Fdbus.git

Merge remote-tracking branch 'origin/dbus-1.4'
---

0ecd0a02b993685a456da58c5c03e2d3bab17d67
diff --cc cmake/CMakeLists.txt
index b68a39780,04f318a30..e414e0418
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@@ -96,10 -96,10 +96,12 @@@ if(NOT WIN32
  endif(NOT WIN32)
  
  #AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
 -OPTION(DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF)
 +option (DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF)
 +
 +option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF)
  
+ option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF)
+ 
  # do config checks
  INCLUDE(ConfigureChecks.cmake)