RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-07 07:30:09 +00:00
Code Issues Releases Wiki Activity

mencoder was still being built (unsucessfully) if mp3lame was missing

Browse Source 
added a few comments to config.h


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3431 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pl 2001-12-10 12:07:03 +00:00
parent 0f92f704df
commit 12eda0344e
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
configure vendored
View File

@ -640,7 +640,6 @@ _prefix="/usr/local"
# If autodetection is available then the third state is: auto # If autodetection is available then the third state is: auto
_libavcodec=auto _libavcodec=auto
_libavcodecso=no # changed default to no as it causes problems - atmos _libavcodecso=no # changed default to no as it causes problems - atmos
_mp3lame=auto
_mencoder=auto _mencoder=auto
_x11=auto _x11=auto
_dga=auto # 1 2 no auto _dga=auto # 1 2 no auto
@ -2313,46 +2312,44 @@ if test "$_divx4linux_decore" = yes ; then
fi fi
echocheck "libmp3lame (for mencoder)" # mencoder requires those libs: libmp3lame and divx4linux encore
if test "$_mp3lame" = auto ; then if test "$_mencoder" != no ; then
_mencoder=no
echocheck "libmp3lame (required for mencoder)"
_mp3lame=no
cat > $TMPC <<EOF cat > $TMPC <<EOF
#include <lame/lame.h> #include <lame/lame.h>
int main(void) { (void) lame_init(); return 0; } int main(void) { (void) lame_init(); return 0; }
EOF EOF
_mp3lame=no
# Note: libmp3lame usually depends on vorbis # Note: libmp3lame usually depends on vorbis
if cc_check -lmp3lame $_ld_vorbis -lm ; then cc_check -lmp3lame $_ld_vorbis -lm && _mp3lame=yes
_mp3lame=yes if test "$_mp3lame" = yes ; then
fi
fi
if test "$_mp3lame" = yes ; then
_def_mp3lame='#define HAVE_MP3LAME 1' _def_mp3lame='#define HAVE_MP3LAME 1'
_ld_mp3lame="-lmp3lame $_ld_vorbis" _ld_mp3lame="-lmp3lame $_ld_vorbis"
else else
_def_mp3lame='#undef HAVE_MP3LAME' _def_mp3lame='#undef HAVE_MP3LAME'
fi fi
echores "$_mp3lame" echores "$_mp3lame"
echocheck "Divx4linux encore (required for mencoder)"
echocheck "divx4 encore (for mencoder)" _divx4linux_encore=no
#mencoder requires those libs
if test "$_mencoder" != no ; then
cat > $TMPC <<EOF cat > $TMPC <<EOF
#include <encore2.h> #include <encore2.h>
int main(void) { (void) encore(0, 0, 0, 0); return 0; } int main(void) { (void) encore(0, 0, 0, 0); return 0; }
EOF EOF
_mencoder=no
if cc_check -ldivxencore -lm ; then if cc_check -ldivxencore -lm ; then
_mencoder=yes _divx4linux_encore=yes
_ld_encore='-ldivxencore'
fi
fi
if test "$_mencoder" = yes ; then
_def_encore='#define NEW_ENCORE 1' _def_encore='#define NEW_ENCORE 1'
else _ld_encore='-ldivxencore'
else
_def_encore='#undef NEW_ENCORE' _def_encore='#undef NEW_ENCORE'
fi
echores "$_divx4linux_encore"
test "$_mp3lame" = yes && test "$_divx4linux_encore" = yes && _mencoder=yes
fi fi
echores "$_mencoder"
echocheck "lirc" echocheck "lirc"
if test "$_lirc" = auto ; then if test "$_lirc" = auto ; then
@ -2684,7 +2681,8 @@ EOF
############################################################################# #############################################################################
echo "Creating config.h" echo "Creating config.h"
cat > config.h << EOF cat > config.h << EOF
/* -------- Generated by configure ----------- */ /* -------- This file has been automatically generated by configure ---------
Note: Any changes in it will be lost when you run configure again. */
/* define this to use simple idct with patched libavcodec */ /* define this to use simple idct with patched libavcodec */
#define SIMPLE_IDCT 1 #define SIMPLE_IDCT 1
@ -2692,8 +2690,10 @@ cat > config.h << EOF
#define USE_OSD 1 #define USE_OSD 1
#define USE_SUB 1 #define USE_SUB 1
/* Toggles debugging informations */
$_def_debug $_def_debug
/* Indicates is Ogle's libdvdread is available for DVD playback */
$_def_dvdread $_def_dvdread
/* Common data directory (for fonts, etc) */ /* Common data directory (for fonts, etc) */
@ -2706,8 +2706,13 @@ $_def_dvdread
/* Define for using new DivX4Linux library, instead of open-source OpenDivX */ /* Define for using new DivX4Linux library, instead of open-source OpenDivX */
/* You have to change DECORE_LIBS in config.mak too! */ /* You have to change DECORE_LIBS in config.mak too! */
$_def_decore $_def_decore
/* Indicates if Divx4linux encore is available
Note: REQUIRED for mencoder */
$_def_encore $_def_encore
/* Indicates if libmp3lame is available
Note: REQUIRED for mencoder */
$_def_mp3lame $_def_mp3lame
/* Define this to enable avg. byte/sec-based AVI sync method by default: /* Define this to enable avg. byte/sec-based AVI sync method by default: