--- a/CMakeLists.txt	Tue Jan 26 13:03:50 2010 +0200
+++ b/CMakeLists.txt	Mon Feb 15 17:12:12 2010 +0200
@@ -26,12 +26,15 @@
 pkg_check_modules(GMODULE REQUIRED gmodule-2.0) 
 pkg_check_modules(LM REQUIRED loudmouth-1.0)
 pkg_check_modules(PNG REQUIRED libpng12)
+pkg_check_modules(MCABBER REQUIRED mcabber)
 set(AALIB_LIBRARY_DIRS "/usr/lib" CACHE FILEPATH "Path, where AAlib is located")
 set(AALIB_INCLUDE_DIRS "/usr/include" CACHE FILEPATH "Path to AAlib includes")
 set(AALIB_LIBRARIES "-laa" CACHE TEXT "Libraries, necessary to link with AAlib")
-find_program(GREP_EXECUTABLE grep DOC "Grep binary to detect functions in headers")
-if(GREP_EXECUTABLE)
-	execute_process(COMMAND ${GREP_EXECUTABLE} xmpp_is_online ${MCABBER_INCLUDE_DIR}/mcabber/xmpp.h OUTPUT_VARIABLE HAVE_XMPP_IS_ONLINE ERROR_QUIET)
+include(CheckIncludeFile)
+set(CMAKE_REQUIRED_INCLUDES ${MCABBER_INCLUDE_DIRS})
+check_include_file(mcabber/pep.h HAVE_MCABBER_PEP_H)
+if(NOT HAVE_MCABBER_PEP_H)
+	message(SEND_ERROR "Pep module header not found")
 endif()
 include(CheckSymbolExists)
 set(CMAKE_REQUIRED_INCLUDES ${LM_INCLUDE_DIRS})
@@ -42,7 +45,8 @@
 				 ${GMODULE_LIBRARY_DIRS}
 				 ${LM_LIBRARY_DIRS}
 				 ${PNG_LIBRARY_DIRS}
-				 ${AALIB_LIBRARY_DIRS})
+				 ${AALIB_LIBRARY_DIRS}
+				 ${MCABBER_LIBRARY_DIRS})
 
 ## Target definitions
 add_library(avatar MODULE avatar.c) 
@@ -54,12 +58,13 @@
                     ${LM_INCLUDE_DIRS}
 					${PNG_INCLUDE_DIRS}
 					${AALIB_INCLUDE_DIRS}
-                    ${MCABBER_INCLUDE_DIR})
+                    ${MCABBER_INCLUDE_DIRS})
 target_link_libraries(avatar ${GLIB_LIBRARIES}
                       ${GMODULE_LIBRARIES}
 					  ${LM_LIBRARIES}
 					  ${PNG_LIBRARIES}
-					  ${AALIB_LIBRARIES})
+					  ${AALIB_LIBRARIES}
+					  ${MCABBER_LIBRARIES})
 include_directories(${avatar_SOURCE_DIR} 
                     ${avatar_BINARY_DIR})
 
@@ -88,4 +93,4 @@
 install(FILES avatar.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
 install(DIRECTORY help DESTINATION share/mcabber)
 
-## The End ## vim: se ts=4: ##
+## The End ## vim: se ts=4 sw=4: ##