Attachment #215335 for bug #299478

Lines 17-22 Link Here

(-)minbif-1.0.orig/CMakeLists.txt (-2 / +3 lines)
17	INCLUDE(FindPkgConfig)	17	INCLUDE(FindPkgConfig)
18		18
19	PKG_CHECK_MODULES(PURPLE REQUIRED purple>=2.4)	19	PKG_CHECK_MODULES(PURPLE REQUIRED purple>=2.4)
		20	PKG_CHECK_MODULES(GTHREAD gthread-2.0 REQUIRED)
20		21
21	OPTION(ENABLE_MINBIF "Enable minbif compilation" ON)	22	OPTION(ENABLE_MINBIF "Enable minbif compilation" ON)
22	OPTION(ENABLE_PLUGIN "Enable plugin build" OFF)	23	OPTION(ENABLE_PLUGIN "Enable plugin build" OFF)
Lines 55-62 Link Here
55	PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0>=2.5)	55	PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0>=2.5)
56	ENDIF(ENABLE_PLUGIN)	56	ENDIF(ENABLE_PLUGIN)
57		57
58	INCLUDE_DIRECTORIES(${PURPLE_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")	58	INCLUDE_DIRECTORIES(${GTHREAD_INCLUDE_DIRS} ${PURPLE_INCLUDE_DIRS} ${CACA_INCLUDE_DIRS} ${IMLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${FARSIGHT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} "src/")
59	LINK_DIRECTORIES(${PURPLE_LINK_DIRS} ${CACA_LINK_DIRS} ${IMLIB_LINK_DIRS} ${GSTREAMER_LINK_DIRS} ${FARSIGHT_LINK_DIRS} ${LIBXML_LINK_DIRS})	59	LINK_DIRECTORIES(${GTHREAD_LIBRARY_DIRS} ${PURPLE_LIBRARY_DIRS} ${CACA_LIBRARY_DIRS} ${IMLIB_LIBRARY_DIRS} ${GSTREAMER_LIBRARY_DIRS} ${FARSIGHT_LIBRARY_DIRS} ${LIBXML_LIBRARY_DIRS})
60		60
61	#IGNORE SET(CMAKE_BUILD_TYPE ${BUILD})	61	#IGNORE SET(CMAKE_BUILD_TYPE ${BUILD})
62	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wall -Wextra -Wno-unused-parameter")	62	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wall -Wextra -Wno-unused-parameter")

Lines 37-43 Link Here

(-)minbif-1.0.orig/src/CMakeLists.txt (-1 / +1 lines)
37	irc/conversation_channel.cpp	37	irc/conversation_channel.cpp
38	)	38	)
39		39
40	TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${PURPLE_LDFLAGS} ${CACA_LDFLAGS} ${IMLIB_LDFLAGS} ${GSTREAMER_LDFLAGS} ${FARSIGHT_LDFLAGS})	40	TARGET_LINK_LIBRARIES(${BIN_NAME} "-lpthread -lstdc++" ${GTHREAD_LIBRARIES} ${PURPLE_LIBRARIES} ${CACA_LIBRARIES} ${IMLIB_LIBRARIES} ${GSTREAMER_LIBRARIES} ${FARSIGHT_LIBRARIES})
41		41
42	INSTALL(TARGETS ${BIN_NAME}	42	INSTALL(TARGETS ${BIN_NAME}
43	DESTINATION bin)	43	DESTINATION bin)

Return to bug 299478