Don't link against yes. Of course it does not work anyway

diff --git a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
index 44f12cdeb8262bc10b68519983ab85801b0519ad..708d791a4767d330ad33cd2d1a178f34abc73146 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
@@ -172,7 +172,7 @@ target_link_libraries(libvlc-control libvlc)
 # Libraries
 
 # iconv
-target_link_libraries(libvlc ${HAVE_ICONV})
+target_link_libraries(libvlc ${LIBICONV})
 
 # Carbon
 if(APPLE)

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index 31b785a31d1ff04472e28bb9b6caedb15ffedaeb..9cb3eab60bc04abe67cfca075b24c7d8901317d1 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -75,9 +75,15 @@ if(NOT HAVE_GETADDRINFO)
     check_library_exists(getaddrinfo nsl "" HAVE_GETADDRINFO)
 endif(NOT HAVE_GETADDRINFO)
 
-find_library(HAVE_ICONV iconv)
+set(LIBICONV "")
+vlc_check_functions_exist(iconv)
+
+if(NOT HAVE_ICONV)
+    set(LIBICONV "iconv")
+    check_library_exists(iconv iconv "" HAVE_ICONV)
+endif(NOT HAVE_ICONV)
 # FIXME: this will break on *BSD:
-set( ICONV_CONST " " )
+set( ICONV_CONST "" )
 
 check_library_exists(rt clock_nanosleep "" HAVE_CLOCK_NANOSLEEP)