Kadu

diff -up kadu/modules/mime_tex/CMakeLists.txt.moduledir kadu/modules/mime_tex/CMakeLists.txt
--- kadu/modules/mime_tex/CMakeLists.txt.moduledir   2009-02-22 17:08:39.000000000 +0100
+++ kadu/modules/mime_tex/CMakeLists.txt   2010-03-18 19:31:25.000000000 +0100
@@ -215,4 +215,4 @@ else (mime_tex STREQUAL STATIC)
    endif (WIN32)
 endif (mime_tex STREQUAL STATIC)
 
-install (TARGETS mime_tex DESTINATION lib/kadu/modules)
+install (TARGETS mime_tex DESTINATION ${MODULEDIR})
diff -up kadu/modules/mime_tex/mimetex/CMakeLists.txt.moduledir kadu/modules/mime_tex/mimetex/CMakeLists.txt
--- kadu/modules/mime_tex/mimetex/CMakeLists.txt.moduledir   2009-02-22 17:08:39.000000000 +0100
+++ kadu/modules/mime_tex/mimetex/CMakeLists.txt   2010-03-18 19:42:58.000000000 +0100
@@ -6,4 +6,4 @@ add_definitions(-DAA)
 
 add_executable(mimetex ${SOURCES})
 target_link_libraries(mimetex m)
-install (TARGETS mimetex DESTINATION lib/kadu/modules/bin/mime_tex)
+install (TARGETS mimetex DESTINATION ${MODULEDIR}/bin/mime_tex)
diff -up kadu/modules/osd_hints/CMakeLists.txt.moduledir kadu/modules/osd_hints/CMakeLists.txt
--- kadu/modules/osd_hints/CMakeLists.txt.moduledir   2008-11-09 11:46:31.000000000 +0100
+++ kadu/modules/osd_hints/CMakeLists.txt   2010-03-18 19:31:25.000000000 +0100
@@ -108,5 +108,5 @@ else (osd_hints STREQUAL STATIC)
    if (APPLE)
       set_target_properties(osd_hints PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
    endif (APPLE)
-   install (TARGETS osd_hints DESTINATION lib/kadu/modules)
+   install (TARGETS osd_hints DESTINATION ${MODULEDIR})
 endif (osd_hints STREQUAL STATIC)
diff -up kadu/modules/powerkadu/CMakeLists.txt.moduledir kadu/modules/powerkadu/CMakeLists.txt
--- kadu/modules/powerkadu/CMakeLists.txt.moduledir   2008-10-23 07:40:16.000000000 +0200
+++ kadu/modules/powerkadu/CMakeLists.txt   2010-03-18 19:31:25.000000000 +0100
@@ -53,4 +53,4 @@ else (powerkadu STREQUAL STATIC)
 endif (powerkadu STREQUAL STATIC)
 add_dependencies (powerkadu powerkadu-translations)
 
-install (TARGETS powerkadu DESTINATION lib/kadu/modules)
+install (TARGETS powerkadu DESTINATION ${MODULEDIR})
diff -up kadu/modules/split_messages/CMakeLists.txt.moduledir kadu/modules/split_messages/CMakeLists.txt
--- kadu/modules/split_messages/CMakeLists.txt.moduledir   2008-12-06 12:12:14.000000000 +0100
+++ kadu/modules/split_messages/CMakeLists.txt   2010-03-18 19:31:25.000000000 +0100
@@ -43,4 +43,4 @@ else (split_messages STREQUAL STATIC)
 endif (split_messages STREQUAL STATIC)
 add_dependencies (split_messages split_messages-translations)
 
-install (TARGETS split_messages DESTINATION lib/kadu/modules)
+install (TARGETS split_messages DESTINATION ${MODULEDIR})
diff -up kadu/modules/tabs/CMakeLists.txt.moduledir kadu/modules/tabs/CMakeLists.txt
--- kadu/modules/tabs/CMakeLists.txt.moduledir   2009-01-18 22:57:08.000000000 +0100
+++ kadu/modules/tabs/CMakeLists.txt   2010-03-18 19:31:25.000000000 +0100
@@ -47,4 +47,4 @@ else (tabs STREQUAL STATIC)
 endif (tabs STREQUAL STATIC)
 add_dependencies (tabs tabs-translations)
 
-install (TARGETS tabs DESTINATION lib/kadu/modules)
+install (TARGETS tabs DESTINATION ${MODULEDIR})

diff -u /home/ecik/download/kadu/modules/voice/CMakeLists.txt ./modules/voice/CMakeLists.txt
--- ./modules/voice/CMakeLists.txt   2008-11-11 21:53:43.000000000 +0100
+++ ./modules/voice/CMakeLists.txt   2008-11-14 22:57:47.000000000 +0100
@@ -37,8 +37,6 @@
 # XXX
 link_directories (${SNDFILE_LIBRARY_DIRS})
 
-add_subdirectory (libgsm)
-
 add_library (voice ${voice} ${SOURCES} ${MOC_FILES})
 add_custom_target (voice-translations DEPENDS ${TRANSLATION_FILES})
 add_dependencies (voice voice-translations)
Wspólne podkatalogi: /home/ecik/download/kadu/modules/voice/translations i ./modules/voice/translations
diff -u /home/ecik/download/kadu/modules/voice/voice.h ./modules/voice/voice.h
--- ./modules/voice/voice.h   2008-11-11 21:53:43.000000000 +0100
+++ ./modules/voice/voice.h   2008-11-14 22:56:20.000000000 +0100
@@ -8,7 +8,7 @@
 #include <QtCore/QList>
 
 extern "C" {
-   #include "libgsm/inc/gsm.h"
+   #include <gsm/gsm.h>
 };
 
 #include "../dcc/dcc.h"

diff -up kadu/kadu-core/CMakeLists.txt.dso kadu/kadu-core/CMakeLists.txt
--- kadu/kadu-core/CMakeLists.txt.dso   2009-10-11 14:41:36.000000000 +0200
+++ kadu/kadu-core/CMakeLists.txt   2010-03-23 23:54:10.000000000 +0100
@@ -163,7 +163,7 @@ endif (MINGW)
 else (WIN32)
    add_executable (kadu main.cpp main_unix.cpp ${kadu_SRCS} ${MOC_FILES})
    set_target_properties (kadu PROPERTIES ENABLE_EXPORTS ON)
-   target_link_libraries (kadu ${STATIC_MODULES} ${QT_LIBRARIES} ${LIBGADU_LIBRARIES})
+   target_link_libraries (kadu ${STATIC_MODULES} ${QT_LIBRARIES} ${LIBGADU_LIBRARIES} -lX11 -ldl)
 endif (WIN32)
 
 install (TARGETS kadu DESTINATION bin)