[patch] fixing as-needed issues

minbif-1.0-as-needed.patch (text/plain), 1.87 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2010-01-05 20:54:43 UTC

--- minbif-1.0.orig/CMakeLists.txt	2010-01-04 20:27:54.691799285 +0100
+++ minbif-1.0/CMakeLists.txt	2010-01-04 20:28:53.633552762 +0100
@@ -17,6 +17,7 @@
 INCLUDE(FindPkgConfig)
 
 PKG_CHECK_MODULES(PURPLE REQUIRED purple>=2.4)
+PKG_CHECK_MODULES(GTHREAD gthread-2.0 REQUIRED)
 
 OPTION(ENABLE_MINBIF "Enable minbif compilation" ON)
 OPTION(ENABLE_PLUGIN "Enable plugin build" OFF)
@@ -55,8 +55,8 @@
 	PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0>=2.5)
 ENDIF(ENABLE_PLUGIN)
 
-INCLUDE_DIRECTORIES(${PURPLE_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")
-LINK_DIRECTORIES(${PURPLE_LINK_DIRS} ${CACA_LINK_DIRS} ${IMLIB_LINK_DIRS} ${GSTREAMER_LINK_DIRS} ${FARSIGHT_LINK_DIRS} ${LIBXML_LINK_DIRS})
+INCLUDE_DIRECTORIES(${GTHREAD_INCLUDE_DIRS} ${PURPLE_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")
+LINK_DIRECTORIES(${GTHREAD_LIBRARY_DIRS} ${PURPLE_LIBRARY_DIRS} ${CACA_LIBRARY_DIRS} ${IMLIB_LIBRARY_DIRS} ${GSTREAMER_LIBRARY_DIRS} ${FARSIGHT_LIBRARY_DIRS} ${LIBXML_LIBRARY_DIRS})
 
 #IGNORE SET(CMAKE_BUILD_TYPE ${BUILD})
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64  -Wall -Wextra -Wno-unused-parameter")
--- minbif-1.0.orig/src/CMakeLists.txt	2010-01-04 20:31:36.530547802 +0100
+++ minbif-1.0/src/CMakeLists.txt	2010-01-04 20:38:58.010803154 +0100
@@ -37,7 +37,7 @@
 		irc/conversation_channel.cpp
 	      )
 
-TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${PURPLE_LDFLAGS} ${CACA_LDFLAGS} ${IMLIB_LDFLAGS} ${GSTREAMER_LDFLAGS} ${FARSIGHT_LDFLAGS})
+TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${GTHREAD_LIBRARIES} ${PURPLE_LIBRARIES} ${CACA_LIBRARIES} ${IMLIB_LIBRARIES} ${GSTREAMER_LIBRARIES} ${FARSIGHT_LIBRARIES})
 
 INSTALL(TARGETS ${BIN_NAME}
         DESTINATION bin)