--- a/CMakeLists.txt	Thu Jan 21 15:43:39 2010 +0200
+++ b/CMakeLists.txt	Mon Feb 15 18:52:58 2010 +0200
@@ -18,16 +18,17 @@
 project(pep 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(LM REQUIRED loudmouth-1.0) 
+pkg_check_modules(MCABBER REQUIRED mcabber)
 link_directories(${GLIB_LIBRARY_DIRS}
 				 ${GMODULE_LIBRARY_DIRS}
-				 ${LM_LIBRARY_DIRS})
+				 ${LM_LIBRARY_DIRS}
+				 ${MCABBER_LIBRARY_DIRS})
 
 ## Target definitions
 add_library(pep MODULE pep.c) 
@@ -36,10 +37,11 @@
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
                     ${GMODULE_INCLUDE_DIRS} 
                     ${LM_INCLUDE_DIRS}
-					${MCABBER_INCLUDE_DIR})
+					${MCABBER_INCLUDE_DIRS})
 target_link_libraries(pep ${GLIB_LIBRARIES} 
                       ${GMODULE_LIBRARIES}
-					  ${LM_LIBRARIES})
+					  ${LM_LIBRARIES}
+					  ${MCABBER_LIBRARIES})
 include_directories(${pep_SOURCE_DIR} 
                     ${pep_BINARY_DIR})