--- a/CMakeLists.txt	Mon Feb 23 17:05:43 2009 +0200
+++ b/CMakeLists.txt	Mon Feb 23 18:27:13 2009 +0200
@@ -4,14 +4,15 @@
 
 ## User options
 option(DEBUG "Enable debugging output" ON)
+option(LLM_LOG_HANDLER "Enable registration of log messages handler for lua-loudmouth library's messages" ON)
 set(MCABBER_INCLUDE_DIR "/home/isbear/src/mcabber/hglm/mcabber/src" CACHE FILEPATH "Path to mcabber headers")
+set(LUA_HOOK_NAME "hook_handler" CACHE STRING "Lua function name to be called on hook invocation")
 
 ## Define targets
 add_library(mcabber-lua MODULE main.c util.c)
 get_target_property(mcabber-lua_SOURCES mcabber-lua SOURCES)
 
 ## Packaging information
-#set(CPACK_PACKAGE_NAME mcabber-lua)
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 0)
 set(CPACK_PACKAGE_VERSION_PATCH 0)
@@ -33,16 +34,15 @@
 
 ## Gather information about system
 find_package(Lua51 REQUIRED)
-#execute_process(COMMAND lua -e "print ( package.path )" OUTPUT_VARIABLE LUA_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-#execute_process(COMMAND lua -e "print ( package.cpath )" OUTPUT_VARIABLE LUA_CPATH OUTPUT_STRIP_TRAILING_WHITESPACE)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
+# XXX: we need only headers
 pkg_check_modules(LM REQUIRED loudmouth-1.0)
 find_package(Perl)
 
 ## Set up compiler
-configure_file(config.h.in config.h)
+configure_file(config.h.in config.h ESCAPE_QUOTES)
 include_directories(SYSTEM ${LUA_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS} ${LM_INCLUDE_DIRS})
 target_link_libraries(mcabber-lua ${LUA_LIBRARIES} ${GLIB_LIBRARIES} ${GMODULE_LIBRARIES})
 include_directories(${mcabber-lua_SOURCE_DIR} ${mcabber-lua_BINARY_DIR} ${MCABBER_INCLUDE_DIR})
@@ -52,13 +52,9 @@
 	add_custom_command(OUTPUT ${mcabber-lua_BINARY_DIR}/mcabber-lua.html COMMAND ${PERL_EXECUTABLE} ${mcabber-lua_SOURCE_DIR}/docgen.pl ${mcabber-lua_SOURCES} > ${mcabber-lua_BINARY_DIR}/mcabber-lua.html DEPENDS ${mcabber-lua_SOURCE_DIR}/docgen.pl ${mcabber-lua_SOURCES} WORKING_DIRECTORY ${mcabber-lua_SOURCE_DIR})
 	add_custom_target(doc ALL DEPENDS ${mcabber-lua_BINARY_DIR}/mcabber-lua.html)
 endif()
-#add_custom_target(test COMMAND env "LUA_PATH=${lua-lm_SOURCE_DIR}/?.lua;${LUA_PATH}" "LUA_CPATH=${lua-lm_SOURCE_DIR}/?.so;${lua-lm_BINARY_DIR}/?.so;${LUA_CPATH}" lua ${lua-lm_SOURCE_DIR}/test.lua DEPENDS loudmouth VERBATIM)
-#add_custom_target(test1 COMMAND env "LUA_PATH=${lua-lm_SOURCE_DIR}/?.lua;${LUA_PATH}" "LUA_CPATH=${lua-lm_SOURCE_DIR}/?.so;${lua-lm_BINARY_DIR}/?.so;${LUA_CPATH}" lua ${lua-lm_BINARY_DIR}/test.lua DEPENDS loudmouth VERBATIM)
 
 ## Set up installer
 install(TARGETS mcabber-lua DESTINATION lib/mcabber)
-#install(FILES lm.lua DESTINATION share/lua/5.1)
-#install(FILES test.lua DESTINATION share/doc/${CPACK_PACKAGE_NAME}/examples)
 if(PERL_FOUND)
 	install(FILES ${mcabber-lua_BINARY_DIR}/mcabber-lua.html DESTINATION share/doc/${CPACK_PACKAGE_NAME})
 endif()