Branch: master

af2c2afb 2014-10-05 07:45:13 François Andriot
Fix hardcoded link flag to "dl" library
Fix "dlopen" function detection
M CMakeLists.txt
M tdestyles/kthemestyle/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ee04b5..5433fe1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -475,10 +475,15 @@
 
 ##### check for libdl ###########################
 
-find_library( HAVE_LIBDL dl )
-if( NOT HAVE_LIBDL-NOTFOUND )
-  set( DL_LIBRARIES dl )
-endif( NOT HAVE_LIBDL-NOTFOUND )
+set( DL_LIBRARIES dl )
+check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL )
+if( NOT HAVE_LIBDL )
+  unset( DL_LIBRARIES )
+  check_function_exists( dlopen HAVE_DLOPEN )
+  if( HAVE_DLOPEN )
+    set( HAVE_LIBDL 1 )
+  endif( HAVE_DLOPEN )
+endif( NOT HAVE_LIBDL )
 
 
 ##### check for utempter ########################
diff --git a/tdestyles/kthemestyle/CMakeLists.txt b/tdestyles/kthemestyle/CMakeLists.txt
index 4c2f06d..8a1bd2a 100644
--- a/tdestyles/kthemestyle/CMakeLists.txt
+++ b/tdestyles/kthemestyle/CMakeLists.txt
@@ -36,6 +36,6 @@
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdefx-shared tdecore-shared dl
+  LINK tdefx-shared tdecore-shared ${DL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
 )