summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-09-18 10:46:47 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:57 +0200
commit57a209ddd5208bd9236b46bac74aaff128499a01 (patch)
treed93617f9ac7adde9710ad2ac4bca5255c7fa0fb7 /configure
parent755ae2801d013b1ce85034738d577cb1b2b31935 (diff)
downloadmpv-57a209ddd5208bd9236b46bac74aaff128499a01.tar.bz2
mpv-57a209ddd5208bd9236b46bac74aaff128499a01.tar.xz
configure: Make sure that CONFIG_LIBMP3LAME is always #defined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32301 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 1 insertions, 2 deletions
diff --git a/configure b/configure
index d269616e00..6113263624 100755
--- a/configure
+++ b/configure
@@ -6789,6 +6789,7 @@ echores "$_zr"
if test "$_mencoder" != no ; then
echocheck "libmp3lame"
+def_mp3lame='#undef CONFIG_MP3LAME'
def_mp3lame_preset='#undef CONFIG_MP3LAME_PRESET'
def_mp3lame_preset_medium='#undef CONFIG_MP3LAME_PRESET_MEDIUM'
if test "$_mp3lame" = auto ; then
@@ -6807,8 +6808,6 @@ if test "$_mp3lame" = yes ; then
libs_mencoder="$libs_mencoder $_ld_mp3lame"
function_check lame/lame.h 'lame_set_preset(NULL, STANDARD_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET 1"
function_check lame/lame.h 'lame_set_preset(NULL, MEDIUM_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1"
-else
- def_mp3lame='#undef CONFIG_MP3LAME'
fi
echores "$_mp3lame"