comparison configure @ 33837:aeba53d139c9

configure: Only link against encode-only libs if mencoder is enabled. This fixes Bugzilla #1720.
author diego
date Mon, 25 Jul 2011 23:30:24 +0000
parents 495340edba54
children ebc24527c63f
comparison
equal deleted inserted replaced
33836:99982afd6dc5 33837:aeba53d139c9
6520 fi 6520 fi
6521 echores "$_musepack" 6521 echores "$_musepack"
6522 6522
6523 6523
6524 echocheck "FAAC support" 6524 echocheck "FAAC support"
6525 if test "$_faac" = auto ; then 6525 if test "$_faac" = auto && test "$_mencoder" = yes ; then
6526 cat > $TMPC <<EOF 6526 cat > $TMPC <<EOF
6527 #include <inttypes.h> 6527 #include <inttypes.h>
6528 #include <faac.h> 6528 #include <faac.h>
6529 int main(void) { unsigned long x, y; faacEncOpen(48000, 2, &x, &y); return 0; } 6529 int main(void) { unsigned long x, y; faacEncOpen(48000, 2, &x, &y); return 0; }
6530 EOF 6530 EOF
6970 fi 6970 fi
6971 echores "$_xvid_lavc" 6971 echores "$_xvid_lavc"
6972 6972
6973 6973
6974 echocheck "x264" 6974 echocheck "x264"
6975 if test "$_x264" = auto ; then 6975 if test "$_x264" = auto && test "$_mencoder" = yes ; then
6976 cat > $TMPC << EOF 6976 cat > $TMPC << EOF
6977 #include <inttypes.h> 6977 #include <inttypes.h>
6978 #include <x264.h> 6978 #include <x264.h>
6979 #if !(X264_BUILD >= 115) 6979 #if !(X264_BUILD >= 115)
6980 #error We do not support old versions of x264. Get the latest from git. 6980 #error We do not support old versions of x264. Get the latest from git.
7144 def_zr='#undef CONFIG_ZR' 7144 def_zr='#undef CONFIG_ZR'
7145 novomodules="zr zr2 $novomodules" 7145 novomodules="zr zr2 $novomodules"
7146 fi 7146 fi
7147 echores "$_zr" 7147 echores "$_zr"
7148 7148
7149 # mencoder requires (optional) those libs: libmp3lame
7150 if test "$_mencoder" != no ; then
7151 7149
7152 echocheck "libmp3lame" 7150 echocheck "libmp3lame"
7153 def_mp3lame='#undef CONFIG_MP3LAME' 7151 def_mp3lame='#undef CONFIG_MP3LAME'
7154 def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 0" 7152 def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 0"
7155 def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET' 7153 def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET'
7156 def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM' 7154 def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM'
7157 if test "$_mp3lame" = auto ; then 7155 if test "$_mp3lame" = auto && test "$_mencoder" = yes; then
7158 _mp3lame=no 7156 _mp3lame=no
7159 statement_check lame/lame.h 'lame_set_VBR_quality(NULL, 0)' -lmp3lame && 7157 statement_check lame/lame.h 'lame_set_VBR_quality(NULL, 0)' -lmp3lame &&
7160 _mp3lame=yes && _mp3lame_lavc=yes 7158 _mp3lame=yes && _mp3lame_lavc=yes
7161 fi 7159 fi
7162 if test "$_mp3lame" = yes ; then 7160 if test "$_mp3lame" = yes ; then
7174 _mp3lame_lavc=no 7172 _mp3lame_lavc=no
7175 fi 7173 fi
7176 res_comment="in FFmpeg: $_mp3lame_lavc" 7174 res_comment="in FFmpeg: $_mp3lame_lavc"
7177 echores "$_mp3lame" 7175 echores "$_mp3lame"
7178 7176
7179 fi # test "$_mencoder" != no
7180 7177
7181 echocheck "mencoder" 7178 echocheck "mencoder"
7182 if test "$_mencoder" = yes ; then 7179 if test "$_mencoder" = yes ; then
7183 def_muxers='#define CONFIG_MUXERS 1' 7180 def_muxers='#define CONFIG_MUXERS 1'
7184 else 7181 else