Remove most traces of glib.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0809d0..81d225b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,15 +79,6 @@ ELSE ( NOT DBUS_FOUND)
   INCLUDE_DIRECTORIES(${DBUS_ARCH_INCLUDE_DIR})
 ENDIF( NOT DBUS_FOUND)
 
-FIND_PACKAGE(Glib REQUIRED)
-IF (GLIB_FOUND)
-  MESSAGE( STATUS "glib found: includes in ${GLIB_INCLUDE_DIR}, library in ${GLIB_LIBRARY}")
-  INCLUDE_DIRECTORIES(${GLIB_INCLUDE_DIR})
-  INCLUDE_DIRECTORIES(${GLIB_CONFIG_INCLUDE_DIR})
-ELSE(GLIB_FOUND)
-  MESSAGE( FATAL_ERROR "glib not found" )
-ENDIF(GLIB_FOUND)
-
 FIND_PACKAGE(Curl REQUIRED)
 IF ( NOT CURL_FOUND)
   MESSAGE( FATAL_ERROR " curl not found" )

diff --git a/cmake/modules/FindGlib.cmake b/cmake/modules/FindGlib.cmake
deleted file mode 100644 (file)
index 224c561..0000000
--- a/cmake/modules/FindGlib.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-
-if(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
-       # Already in cache, be silent
-       set(GLIB_FIND_QUIETLY TRUE)     
-endif(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
-
-set(GLIB_LIBRARY)
-set(GLIB_INCLUDE_DIR)
-set(GLIB_CONFIG_INCLUDE_DIR)
-
-FIND_PATH(GLIB_INCLUDE_DIR glib.h
-       /usr/include
-       /usr/include/glib-2.0
-       /opt/gnome/include/glib-2.0
-       /usr/local/include
-)
-
-FIND_PATH(GLIB_CONFIG_INCLUDE_DIR glibconfig.h
-  /opt/gnome/lib/glib-2.0/include
-  /usr/lib/glib-2.0/include
-  /opt/gnome/lib64/glib-2.0/include
-  /usr/lib64/glib-2.0/include
-)
-
-FIND_LIBRARY(GLIB_LIBRARY NAMES glib glib-2.0
-       PATHS
-       /usr/lib
-       /opt/gnome/lib
-       /usr/local/lib
-)
-
-if(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
-   MESSAGE( STATUS "glib found: includes in ${GLIB_INCLUDE_DIR}, library in ${GLIB_LIBRARY}")
-   set(GLIB_FOUND TRUE)
-else(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
-   MESSAGE( STATUS "glib not found")
-endif(GLIB_INCLUDE_DIR AND GLIB_LIBRARY AND GLIB_CONFIG_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(GLIB_INCLUDE_DIR GLIB_LIBRARY GLIB_CONFIG_INCLUDE_DIR)
\ No newline at end of file

diff --git a/zypp/target/hal/Hal.cc b/zypp/target/hal/Hal.cc
index 1cc4a4c..29182da 100644 (file)
--- a/zypp/target/hal/Hal.cc
+++ b/zypp/target/hal/Hal.cc
@@ -19,10 +19,6 @@
 
 #ifndef FAKE_HAL
 
-#include <glib.h>
-
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib.h>
 #include <hal/libhal.h>
 
 #endif

diff --git a/zypp/target/hal/HalContext.cc b/zypp/target/hal/HalContext.cc
index 8d2ff62..640902d 100644 (file)
--- a/zypp/target/hal/HalContext.cc
+++ b/zypp/target/hal/HalContext.cc
@@ -20,8 +20,6 @@
 #include <zypp/base/String.h>
 #include <zypp/base/Gettext.h>
 
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib.h>
 #include <hal/libhal.h>
 #include <hal/libhal-storage.h>