--- hg/CMakeLists.txt.link	2010-04-18 14:50:13.000000000 +0200
+++ hg/CMakeLists.txt	2010-04-18 14:50:49.000000000 +0200
@@ -134,6 +134,7 @@
 ## Pass-throughs
 
 include_directories(../misc)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../misc)
 
 # Library
 
@@ -164,7 +165,7 @@
 endif (OPENVAS_PID_DIR)
 
 target_link_libraries (openvas_hg_static ${GLIB_LDFLAGS})
-target_link_libraries (openvas_hg_shared ${GLIB_LDFLAGS})
+target_link_libraries (openvas_hg_shared ${GLIB_LDFLAGS} openvas_misc resolv)
 
 # install library
 message ("-- installing libraries...")
--- misc/CMakeLists.txt.link	2010-03-24 08:43:00.000000000 +0100
+++ misc/CMakeLists.txt	2010-04-18 14:49:15.000000000 +0200
@@ -133,11 +133,13 @@
 include_directories(../base)
 
 ## Config
-
-exec_program (pkg-config
-              ARGS --cflags glib-2.0
-              OUTPUT_VARIABLE GLIB_CFLAGS)
-
+include(FindPkgConfig)
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+include_directories(${GLIB_INCLUDE_DIRS})
+
+pkg_check_modules(GNUTLS REQUIRED gnutls)
+include_directories(${GNUTLS_INCLUDE_DIRS})
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../base)
 
 # Library
 
@@ -158,13 +160,11 @@
              share_fd.h store.h system.h www_funcs.h)
 
 add_library (openvas_misc_static STATIC ${FILES})
-set_target_properties (openvas_misc_static PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS}")
 set_target_properties (openvas_misc_static PROPERTIES OUTPUT_NAME "openvas_misc")
 set_target_properties (openvas_misc_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 set_target_properties (openvas_misc_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
 
 add_library (openvas_misc_shared SHARED ${FILES})
-set_target_properties (openvas_misc_shared PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS}")
 set_target_properties (openvas_misc_shared PROPERTIES OUTPUT_NAME "openvas_misc")
 set_target_properties (openvas_misc_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 set_target_properties (openvas_misc_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
@@ -184,8 +184,8 @@
   add_definitions (-DONF_DIR=\\\"${OPENVAS_SYSCONF_DIR}\\\")
 endif (OPENVAS_SYSCONF_DIR)
 
-target_link_libraries (openvas_misc_static ${GLIB_LDFLAGS})
-target_link_libraries (openvas_misc_shared ${GLIB_LDFLAGS})
+target_link_libraries (openvas_misc_static ${GLIB_LDFLAGS} ${GNUTLS_LDFLAGS} )
+target_link_libraries (openvas_misc_shared ${GLIB_LDFLAGS} ${GNUTLS_LDFLAGS} openvas_base pcap gcrypt)
 
 # install library
 message ("-- installing libraries...")