Add missing libs. Not sure if this is the right way to do it though

diff --git a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
index a53aa4ab6ed8669a088c12263f5d98ef236f63a0..49c473e90c8cd4f7525b013db151e1db37caec20 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
@@ -134,7 +134,8 @@ endif(SYS_DARWIN)
 
 add_library(libvlc SHARED ${SOURCES_libvlc})
 install_targets(/lib libvlc)
-set_target_properties(libvlc PROPERTIES LINK_FLAGS "${LIBICONV}")
+set_target_properties(libvlc PROPERTIES LINK_FLAGS
+       "-z defs --as-needed -lm ${LIBRT} ${LIBICONV} ${CMAKE_THREAD_LIBS_INIT}")
 set_target_properties(libvlc PROPERTIES SOVERSION 1.0.0)
 
 # libvlc-control
@@ -241,5 +242,6 @@ set(about)
 # SET_TARGET_PROPERTIES
 
 set_target_properties(libvlc libvlc-control PROPERTIES PREFIX "")
+set_target_properties(libvlc-control PROPERTIES LINK_FLAGS "-z defs --as-needed")
 set_target_properties(libvlc libvlc-control vlc PROPERTIES COMPILE_FLAGS
     "-Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wmissing-prototypes" )

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index 38e3de5833aa177df3f04a60b606bb084cd6bc09..b08b6604d131f4a9805623b69cf35b71c11b6d7a 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -80,13 +80,16 @@ set(LIBICONV "")
 vlc_check_functions_exist(iconv)
 
 if(NOT HAVE_ICONV)
-    set(LIBICONV "iconv")
+    set(LIBICONV "-liconv")
     check_library_exists(iconv iconv "" HAVE_ICONV)
 endif(NOT HAVE_ICONV)
 # FIXME: this will break on *BSD:
 set( ICONV_CONST "" )
 
 check_library_exists(rt clock_nanosleep "" HAVE_CLOCK_NANOSLEEP)
+if (HAVE_CLOCK_NANOSLEEP)
+    set(LIBRT "-lrt")
+endif (HAVE_CLOCK_NANOSLEEP)
 
 ###########################################################
 # Other check