From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-16 14:35:24.498138986 +0200

Properly search for libraries using pkgconfig rather than
reinventing the error-prone hand-crafted search once again.

---
 src/flowtop/CMakeLists.txt     |   11 +++++++----
 src/netsniff-ng/CMakeLists.txt |    6 ++++--
 src/trafgen/CMakeLists.txt     |    6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

Index: netsniff-ng-0.5.7/src/flowtop/CMakeLists.txt
===================================================================
--- netsniff-ng-0.5.7.orig/src/flowtop/CMakeLists.txt
+++ netsniff-ng-0.5.7/src/flowtop/CMakeLists.txt
@@ -2,11 +2,12 @@ PROJECT(flowtop C)
 
 SET(BUILD_STRING "generic")
 
+find_package(PkgConfig)
 FIND_PACKAGE(LibGeoIP)
 FIND_PACKAGE(Threads)
 FIND_PACKAGE(Curses)
-FIND_PACKAGE(LibNetFilterConnTrack)
-FIND_PACKAGE(LibURCU)
+pkg_check_modules(LIBNETFILTER_CONNTRACK libnetfilter_conntrack)
+pkg_check_modules(LIBURCU liburcu)
 INCLUDE(Pod2Man)
 
 IF(CURSES_FOUND AND CMAKE_HAVE_PTHREAD_CREATE AND LIBGEOIP_FOUND AND LIBNETFILTER_CONNTRACK_FOUND AND LIBURCU_FOUND)
@@ -23,8 +24,10 @@ IF(CURSES_FOUND AND CMAKE_HAVE_PTHREAD_C
 					../flowtop.c)
 	ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}"
 			-DVERSION_STRING="${VERSION}"
-			-DBUILD_STRING="${BUILD_STRING}")
-	TARGET_LINK_LIBRARIES(flowtop ${CURSES_NCURSES_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${LIBNETFILTER_CONNTRACK_LIBRARY} ${LIBGEOIP_LIBRARY} ${LIBURCU_LIBRARY})
+			-DBUILD_STRING="${BUILD_STRING}"
+			${LIBNETFILTER_CONNTRACK_CFLAGS}
+			${LIBURCU_CFLAGS})
+	TARGET_LINK_LIBRARIES(flowtop ${CURSES_NCURSES_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${LIBNETFILTER_CONNTRACK_LIBRARIES} ${LIBGEOIP_LIBRARY} ${LIBURCU_LIBRARIES})
 	POD2MAN(${CMAKE_SOURCE_DIR}/flowtop.c flowtop 8)
 	INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH})
 	INSTALL(FILES 	../conf/oui.conf
Index: netsniff-ng-0.5.7/src/netsniff-ng/CMakeLists.txt
===================================================================
--- netsniff-ng-0.5.7.orig/src/netsniff-ng/CMakeLists.txt
+++ netsniff-ng-0.5.7/src/netsniff-ng/CMakeLists.txt
@@ -1,8 +1,9 @@
 PROJECT(netsniff-ng C)
 
 SET(BUILD_STRING "generic")
+find_package(PkgConfig)
 FIND_PACKAGE(Threads)
-FIND_PACKAGE(Libnl)
+pkg_check_modules(LIBNL libnl-1)
 INCLUDE(Pod2Man)
 
 IF (CMAKE_HAVE_PTHREAD_CREATE AND LIBNL_FOUND)
@@ -54,7 +55,8 @@ IF (CMAKE_HAVE_PTHREAD_CREATE AND LIBNL_
 		-D_FILE_OFFSET_BITS=64
 		-D_LARGEFILE_SOURCE
 		-D_LARGEFILE64_SOURCE
-		-D__WITH_PROTOS)
+		-D__WITH_PROTOS
+		${LIBNL_CFLAGS})
 #		-D__WITH_HARDWARE_TIMESTAMPING)
 	POD2MAN(${CMAKE_SOURCE_DIR}/netsniff-ng.c netsniff-ng 8)
 	TARGET_LINK_LIBRARIES(netsniff-ng ${CMAKE_THREAD_LIBS_INIT} ${LIBNL_LIBRARIES})
Index: netsniff-ng-0.5.7/src/trafgen/CMakeLists.txt
===================================================================
--- netsniff-ng-0.5.7.orig/src/trafgen/CMakeLists.txt
+++ netsniff-ng-0.5.7/src/trafgen/CMakeLists.txt
@@ -3,7 +3,8 @@ PROJECT(trafgen C)
 FIND_PACKAGE(FLEX)
 FIND_PACKAGE(BISON)
 FIND_PACKAGE(LibCLI)
-FIND_PACKAGE(Libnl)
+find_package(PkgConfig)
+pkg_check_modules(LIBNL libnl-1)
 INCLUDE(Pod2Man)
 
 SET(BUILD_STRING "generic")
@@ -23,7 +24,8 @@ IF(LIBCLI_FOUND AND FLEX_FOUND AND BISON
 					../trafgen.c)
 	ADD_DEFINITIONS(-DPROGNAME_STRING="${PROJECT_NAME}"
 			-DVERSION_STRING="${VERSION}"
-			-DBUILD_STRING="${BUILD_STRING}")
+			-DBUILD_STRING="${BUILD_STRING}"
+			${LIBNL_CFLAGS})
 	TARGET_LINK_LIBRARIES(trafgen ${LIBCLI_LIBRARY} ${LIBNL_LIBRARIES})
 	POD2MAN(${CMAKE_SOURCE_DIR}/trafgen.c trafgen 8)
 	INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${EXECUTABLE_INSTALL_PATH})