From f0996fb64cd26f96f203c5d5e39bb0a2d691d155 Mon Sep 17 00:00:00 2001
From: rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 8 Oct 2006 14:10:43 +0000
Subject: Disable linking mplayer with mp3lame when --disable-encoder=mp3lame
 is passed to configure.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20114 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile  | 7 +++++--
 configure | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 177e381cea..98c8c6aad6 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,6 @@ CODEC_LIBS = $(AV_LIB) \
              $(THEORA_LIB) \
              $(FAAD_LIB) \
              $(LIBLZO_LIB) \
-             $(DECORE_LIB) \
              $(XVID_LIB) \
              $(DTS_LIB) \
              $(PNG_LIB) \
@@ -112,6 +111,10 @@ CODEC_LIBS = $(AV_LIB) \
              $(SPEEX_LIB) \
              $(NUT_LIB) \
 
+ifeq ($(LAVC_MP3LAME),yes)
+CODEC_LIBS += $(MP3LAME_LIB)
+endif
+
 ifeq ($(TOOLAME),yes)
 CODEC_LIBS += $(TOOLAME_LIB)
 endif
@@ -388,7 +391,7 @@ $(PRG):	$(MPLAYER_DEP)
 
 ifeq ($(MENCODER),yes)
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
-                $(ENCORE_LIB) \
+                $(MP3LAME_LIB) \
                 $(COMMON_LIBS) \
 
 $(PRG_MENCODER): $(MENCODER_DEP)
diff --git a/configure b/configure
index 3c75169a16..ea91762043 100755
--- a/configure
+++ b/configure
@@ -6636,6 +6636,7 @@ EOF
 int main(void) { int p = MEDIUM_FAST; return 0; }
 EOF
     cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM"
+    echo $_libavencoders | grep -q mp3lame && _lavc_mp3lame=yes || _lavc_mp3lame=no
   else
     _def_mp3lame='#undef HAVE_MP3LAME'
   fi
@@ -7571,9 +7572,9 @@ LIBNUT = $_nut
 NUT_LIB = $_ld_nut
 CONFIG_DTS = $_libdts
 DTS_LIB = $_ld_libdts
-DECORE_LIB = $_ld_mp3lame
 MENCODER = $_mencoder
-ENCORE_LIB = $_ld_mp3lame
+MP3LAME_LIB = $_ld_mp3lame
+LAVC_MP3LAME = $_lavc_mp3lame
 DIRECTFB_LIB = $_ld_directfb
 CDDA = $_cdda
 CDPARANOIA_LIB = $_ld_cdparanoia
-- 
cgit v1.2.3