vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Oct 11 18:45:43 2010 +0300| [67ee9ccd6cd0d662458ca43dff9f5262b228354e] | committer: Rémi Denis-Courmont
Don't check for live555 headers twice If the version header is there, the main one should be too. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67ee9ccd6cd0d662458ca43dff9f5262b228354e --- configure.ac | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index a662436..d56b735 100644 --- a/configure.ac +++ b/configure.ac @@ -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++) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
