From: Rémi Duraffort Date: Thu, 9 Jul 2009 08:39:17 +0000 (+0200) Subject: stream_out siwtcher needs avcodec (fix missing symbols). X-Git-Tag: 1.1.0-ff~5077 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=6ceccc7d90fb2499e6ce043a7c179c8273beff77;ds=sidebyside stream_out siwtcher needs avcodec (fix missing symbols). --- diff --git a/configure.ac b/configure.ac index 503872e802..ed4128057f 100644 --- a/configure.ac +++ b/configure.ac @@ -1707,12 +1707,6 @@ AS_IF([test "${enable_sout}" != "no"], [ ]) AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) -AC_ARG_ENABLE(switcher, - [ --enable-switcher Stream-out switcher plugin (default disabled)]) -AS_IF([test "${enable_switcher}" = "yes"], [ - VLC_ADD_PLUGIN([stream_out_switcher]) -]) - dnl Check for libshout AC_ARG_ENABLE(shout, [ --enable-shout libshout output plugin (default disabled)]) @@ -3008,11 +3002,27 @@ then VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) VLC_RESTORE_FLAGS + have_avcodec="yes" ],[ AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.]) ]) fi +dnl +dnl stream_out switcher needs libavcodec +dnl +AC_ARG_ENABLE(switcher, + [ --enable-switcher Stream-out switcher plugin (default disabled)]) +AS_IF([test "${enable_switcher}" = "yes"], [ + AS_IF([test "x${have_avcodec}" = "xyes"], [ + VLC_ADD_PLUGIN([stream_out_switcher]) + VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS]) + VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS]) + ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec]) + ]) +]) + + dnl dnl avformat demuxer/muxer plugin dnl