]> git.sesse.net Git - vlc/commitdiff
Don't check for live555 headers twice
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 11 Oct 2010 15:45:43 +0000 (18:45 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 11 Oct 2010 15:50:56 +0000 (18:50 +0300)
If the version header is there, the main one should be too.

configure.ac

index a662436fe09c73b724350d9ac07aa1f37dd096d8..d56b7358d7d08596a3df7000cf187709552109dc 100644 (file)
@@ -1765,19 +1765,15 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.])
 
           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_pic}])
+          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_MSG_WARN([The development files for liveMedia (live555) can't be found])
-          ])
+            AC_CHECK_LIB(liveMedia, main, [
+            VLC_ADD_PLUGIN([live555])
+            VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
+          ],[],[${other_libs}]) ],[${other_libs_pic}])
 
           CPPFLAGS="${CPPFLAGS_save}"
           AC_LANG_POP(C++)