diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 15:12:55 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 15:12:55 +0000 |
commit | ce672fbf1b64aace1d704abd240574c8cdb4495a (patch) | |
tree | a63038b066803e59535214d86797027156e88ae1 /configure | |
parent | 196ec9d95f67b9baf9111432b901d816d646b838 (diff) | |
download | mpv-ce672fbf1b64aace1d704abd240574c8cdb4495a.tar.bz2 mpv-ce672fbf1b64aace1d704abd240574c8cdb4495a.tar.xz |
Fix linking when libavcodec uses x264.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21132 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -6420,8 +6420,8 @@ if test "$_x264" = auto ; then int main(void) { x264_encoder_open((void*)0); return 0; } EOF _x264=no - for _ld_tmp in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_x11 $_ld_lm" ; do - cc_check $_ld_tmp && _libs_mencoder="$_libs_mencoder $_ld_tmp" && _x264=yes && break + for _ld_x264 in "-lx264 $_ld_pthread" "-lx264 $_ld_pthread $_ld_x11 $_ld_lm" ; do + cc_check $_ld_tmp && _libs_mencoder="$_libs_mencoder $_ld_x264" && _x264=yes && break done fi @@ -6432,6 +6432,7 @@ if test "$_x264" = yes ; then if echo $_libavencoders | grep -q x264 ; then _lavc_x264=yes _def_lavc_x264='#define CONFIG_X264 1' + _libs_mplayer="$_libs_mplayer $_ld_x264" else _lavc_x264=no _def_lavc_x264='#undef CONFIG_X264' @@ -7365,9 +7366,6 @@ endif ifeq ($_lavc_mp3lame,yes) EXTRA_LIB += $_ld_mp3lame endif -ifeq ($_lavc_x264,yes) -EXTRA_LIB += $_ld_x264 -endif FREETYPE_LIB = $_ld_freetype FONTCONFIG_LIB = $_ld_fontconfig |