github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-27 17:48:22 +02:00
Code Releases Activity

Get rid of _ld_vorbis.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21178 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-11-22 19:26:52 +00:00
parent 544233bded
commit 00a9c9831d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -5604,13 +5604,13 @@ elif test "$_tremor_external" = yes ; then
_def_tremor='#define TREMOR 1'
_codecmodules="tremor(external) $_codecmodules"
_res_comment="external Tremor"
_ld_vorbis='-logg -lvorbisidec'
_ld_extra="$_ld_extra -logg -lvorbisidec"
elif test "$_libvorbis" = yes ; then
_vorbis=yes
_def_vorbis='#define HAVE_OGGVORBIS 1'
_codecmodules="libvorbis $_codecmodules"
_res_comment="libvorbis"
_ld_vorbis='-lvorbis -logg'
_ld_extra="$_ld_extra -lvorbis -logg"
else
_vorbis=no
_nocodecmodules="libvorbis $_nocodecmodules"
@ -6479,10 +6479,10 @@ if test "$_mencoder" != no ; then
int main(void) { lame_version_t lv; (void) lame_init(); get_lame_version_numerical(&lv); printf("%d%d\n",lv.major,lv.minor); return 0; }
EOF
# Note: libmp3lame usually depends on vorbis
cc_check -lmp3lame $_ld_vorbis $_ld_lm && tmp_run && _mp3lame=yes
cc_check -lmp3lame $_ld_lm && tmp_run && _mp3lame=yes
if test "$_mp3lame" = yes ; then
_def_mp3lame="#define HAVE_MP3LAME"
_ld_mp3lame="-lmp3lame $_ld_vorbis"
_ld_mp3lame=-lmp3lame
_libs_mencoder="$_libs_mencoder $_ld_mp3lame"
cat > $TMPC << EOF
#include <lame/lame.h>
@ -7358,7 +7358,7 @@ JPEG = $_jpeg
GIF = $_gif
EXTRALIBS = $_extra_libs
EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm $_ld_vorbis $_ld_arch
EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm $_ld_arch
EXTRALIBS_MPLAYER = $_libs_mplayer $_ld_sock $_ld_gtk $_ld_glib
EXTRALIBS_MENCODER = $_libs_mencoder