Bug 1227 : From Frederic Heem:

* modify CMakeInstallDirs.cmake according to cmake developper wishes
* FindDBUSGLIB.cmake fixes
* Add HAVE_CHOWN 
* remove DBus from CMakeLists.txt. 
* DBus support has its own application (capdbus) and is in a self contained directory. A separate patch will be provided




git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23300 f5534014-38df-0310-8fa8-9805f1628bb7

2 files changed, 18 insertions, 15 deletions

diff --git a/cmake/modules/CMakeInstallDirs.cmake b/cmake/modules/CMakeInstallDirs.cmake
index ed6cdeed32..19e2c85ed7 100644
--- a/cmake/modules/CMakeInstallDirs.cmake
+++ b/cmake/modules/CMakeInstallDirs.cmake
@@ -39,6 +39,7 @@
 
 # CMAKE_INSTALL_DATADIR
 # CMAKE_INSTALL_SBINDIR
+# CMAKE_INSTALL_DATADIR
 # CMAKE_INSTALL_SYSCONFDIR
 # CMAKE_INSTALL_LOCALSTATEDIR
 # CMAKE_INSTALL_LIBDIR
@@ -60,19 +61,19 @@ IF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
 ENDIF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
 
 #General case
-SET(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin"
+SET(CMAKE_INSTALL_BINDIR "bin"
     CACHE PATH ${CMAKE_INSTALL_BINDIR_DOC})
-SET(CMAKE_INSTALL_SBINDIR "${CMAKE_INSTALL_PREFIX}/sbin"
+SET(CMAKE_INSTALL_SBINDIR "sbin"
     CACHE PATH ${CMAKE_INSTALL_SBINDIR_DOC})
-SET(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share"
+SET(CMAKE_INSTALL_DATADIR "share"
     CACHE PATH ${CMAKE_INSTALL_DATADIR_DOC})
-SET(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc"
+SET(CMAKE_INSTALL_SYSCONFDIR "etc"
     CACHE PATH ${CMAKE_INSTALL_SYSCONFDIR_DOC})
-SET(CMAKE_INSTALL_LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var"
+SET(CMAKE_INSTALL_LOCALSTATEDIR "var"
     CACHE PATH ${CMAKE_INSTALL_LOCALSTATEDIR_DOC})
-SET(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib"
+SET(CMAKE_INSTALL_LIBDIR "lib"
     CACHE PATH ${CMAKE_INSTALL_LIBDIR_DOC})
-SET(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/man"
+SET(CMAKE_INSTALL_MANDIR "man"
     CACHE PATH ${CMAKE_INSTALL_MANDIR_DOC})
 
 
diff --git a/cmake/modules/FindDBUSGLIB.cmake b/cmake/modules/FindDBUSGLIB.cmake
index 61b4a1485d..251bd291bc 100644
--- a/cmake/modules/FindDBUSGLIB.cmake
+++ b/cmake/modules/FindDBUSGLIB.cmake
@@ -38,20 +38,21 @@
 #  Written by Frederic Heem, frederic.heem _at_ telsey.it
 
 # This module defines
-#  DBUSGLIBGLIB_FOUND, true if dbus-glib-1 has been found
-#  DBUSGLIBGLIB_VERSION, the dbus-glib-1 version 
-#  DBUSGLIBGLIB_INCLUDE_DIRS, where to find dbus/dbus-glib.h, etc.
-#  DBUSGLIBGLIB_LIBRARIES, library to link againt libdbus-glib-1
-#  DBUSGLIBGLIB_DEFINITIONS, the definitions used to compile dbus-glib-1
+#  DBUSGLIB_FOUND, true if dbus-glib-1 has been found
+#  DBUSGLIB_VERSION, the dbus-glib-1 version 
+#  DBUSGLIB_INCLUDE_DIRS, where to find dbus/dbus-glib.h, etc.
+#  DBUSGLIB_LIBRARIES, library to link againt libdbus-glib-1
+#  DBUSGLIB_DEFINITIONS, the definitions used to compile dbus-glib-1
+#  DBUSGLIB_BINDING_TOOL_EXECUTABLE the glib dbus binding tool
 
 #D-Bus is required by dbus-glib-1
 FIND_PACKAGE(DBUS REQUIRED)
 
-#Keep space in of $ENV{PKG_CONFIG_PATH} is empty
+#Keep space in case of $ENV{PKG_CONFIG_PATH} is empty
 SET(PKG_CONFIG_PATH " $ENV{PKG_CONFIG_PATH}")
 
 #Find the D-Bus package
-PKGCONFIG_FOUND(dbus-1 ${PKG_CONFIG_PATH} DBUSGLIB_FOUND)
+PKGCONFIG_FOUND(dbus-glib-1 ${PKG_CONFIG_PATH} DBUSGLIB_FOUND)
 
 IF(DBUSGLIB_FOUND)
   MESSAGE(STATUS "D-Bus glib found")
@@ -92,7 +93,7 @@ FIND_LIBRARY(DBUSGLIB_LIBRARY
     ${DBUSGLIB_LIBRARY_DIR}
   DOC 
     ${DBUSGLIB_LIB_PATH_DESCRIPTION}
-  NO_DEFAULT_PATH
+#NO_DEFAULT_PATH TODO fix PKGCONFIG_LIBRARY_DIR when pkg-config returns multiple directories
 )
 
 SET(DBUSGLIB_LIBRARIES ${DBUSGLIB_LIBRARY} ${DBUS_LIBRARIES}) 
@@ -115,6 +116,7 @@ MESSAGE(STATUS "D-Bus glib definitions are ${DBUSGLIB_DEFINITIONS}")
 FIND_PROGRAM(DBUSGLIB_BINDING_TOOL_EXECUTABLE
   NAMES 
     dbus-binding-tool
+  /usr/local/bin
 )
 
 MARK_AS_ADVANCED(