summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 14:10:43 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-08 14:10:43 +0000
commitf0996fb64cd26f96f203c5d5e39bb0a2d691d155 (patch)
tree161299dbf859d922e4c8f042eff62114c945d84a /configure
parent9369a84ebe099be0377acd6d34aeb591934fd5b5 (diff)
downloadmpv-f0996fb64cd26f96f203c5d5e39bb0a2d691d155.tar.bz2
mpv-f0996fb64cd26f96f203c5d5e39bb0a2d691d155.tar.xz
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
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