[vlc-devel] commit: Fix linking of live555 module (Christophe Mutricy )

git version control git at videolan.org
Wed Aug 20 23:32:58 CEST 2008


vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Wed Aug 20 21:58:27 2008 +0100| [a6ce53c55e2627f6bfc186f9f3c08f7b8d37c77c] | committer: Christophe Mutricy 

Fix linking of live555 module

As live555 provides only static lib and we build a plugin, we need to use p$
This partially revert [7b0dd84fff6c300cab5e0bdbf2a29fb1b3618e62]

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6ce53c55e2627f6bfc186f9f3c08f7b8d37c77c
---

 configure.ac |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 908e362..1ea7bb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1838,16 +1838,23 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.])
 	 ])
     ])
      other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
+     other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
       if test "${SYS}" = "mingw32"; then
         # add ws2_32 for closesocket, select, recv
         other_libs="$other_libs -lws2_32"
       fi
+    dnl We need to check for pic because live555 don't provide shared libs
+    dnl and we want to build a plugins so we need -fPIC on some arch.
     AC_CHECK_HEADERS(liveMedia.hh, [
       VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
+        AC_CHECK_LIB(liveMedia_pic, main, [
+          VLC_ADD_PLUGIN([live555])
+         VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}])
+	 ],[
         AC_CHECK_LIB(liveMedia, main, [
           VLC_ADD_PLUGIN([live555])
           VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
-        ],[],[${other_libs}])
+        ],[],[${other_libs}]) ],[${other_libs_pic}])
     ])
     CPPFLAGS="${CPPFLAGS_save}"
     AC_LANG_POP(C++)




More information about the vlc-devel mailing list