diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:26:52 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:26:52 +0000 |
| commit | 00a9c9831d59887c97991fca1bfb5088ca0d6b1a (patch) | |
| tree | 575f8cce9c965646fd3493d915e6a580d36662a5 /configure | |
| parent | 544233bded74186eca2498e202ed82003c5e04be (diff) | |
| download | mpv-00a9c9831d59887c97991fca1bfb5088ca0d6b1a.tar.bz2 mpv-00a9c9831d59887c97991fca1bfb5088ca0d6b1a.tar.xz | |
Get rid of _ld_vorbis.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21178 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |