From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 22 Sep 2011 19:26:43 +0000 (+0200)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.4.18~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=443b8ec3da541018f2979e3700bc8d4ee7095136;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'

Conflicts:
	cmake/CMakeLists.txt
---

443b8ec3da541018f2979e3700bc8d4ee7095136
diff --cc cmake/CMakeLists.txt
index 72c423189,51d27cd19..21728a70e
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@@ -87,12 -85,11 +85,11 @@@ if (WIN32
      include(Win32Macros)
      addExplorerWrapper(${CMAKE_PROJECT_NAME})
  endif (WIN32)
- find_package(LibXml2)
- find_package(LibExpat)
- find_package(X11)
+ 
+ option (DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" ON)
  
  if(NOT WIN32)
 -	OPTION(DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON)
 +	option (DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON)
  endif(NOT WIN32)
  
  #AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)