--- a/CMakeLists.txt	Wed Jan 20 21:43:23 2010 +0200
+++ b/CMakeLists.txt	Mon Feb 15 17:53:36 2010 +0200
@@ -18,14 +18,15 @@
 project(env C) 
 
 ## User settable options
-set(MCABBER_INCLUDE_DIR "/usr/include" CACHE FILEPATH "Path to mcabber headers") 
  
 ## Check for build dependencies
 find_package(PkgConfig REQUIRED) 
 pkg_check_modules(GLIB REQUIRED glib-2.0) 
 pkg_check_modules(GMODULE REQUIRED gmodule-2.0) 
+pkg_check_modules(MCABBER REQUIRED mcabber)
 link_directories(${GLIB_LIBRARY_DIRS}
-				 ${GMODULE_LIBRARY_DIRS})
+				 ${GMODULE_LIBRARY_DIRS}
+				 ${MCABBER_LIBRARY_DIRS})
 
 ## Target definitions
 add_library(env MODULE env.c) 
@@ -33,9 +34,10 @@
 ## Compiler setup
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
                     ${GMODULE_INCLUDE_DIRS}
-                    ${MCABBER_INCLUDE_DIR})
+                    ${MCABBER_INCLUDE_DIRS})
 target_link_libraries(env ${GLIB_LIBRARIES} 
-                      ${GMODULE_LIBRARIES})
+                      ${GMODULE_LIBRARIES}
+					  ${MCABBER_LIBRARIES})
 include_directories(${env_SOURCE_DIR} 
                     ${env_BINARY_DIR})