summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 15:20:34 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 15:20:34 +0000
commit2937e6cc983465da84241d9e2d952b72d7006208 (patch)
treecd3b1bdb5093f96c98a468e77f4eec1f5673a50f /configure
parent52ac6f991921ca7ccc72f709f4d315ec47efdd8e (diff)
downloadmpv-2937e6cc983465da84241d9e2d952b72d7006208.tar.bz2
mpv-2937e6cc983465da84241d9e2d952b72d7006208.tar.xz
Work around DTS_INC and MLIB_INC now being gone from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19034 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index b8720f81df..bde6ea2570 100755
--- a/configure
+++ b/configure
@@ -7421,7 +7421,8 @@ HOST_CC = $_host_cc
AWK = $_awk
RANLIB = $_ranlib
INSTALL = $_install
-EXTRA_INC = $_inc_extra
+# FIXME: Should only be $_inc_extra, time to get rid of all --with-fooincdir.
+EXTRA_INC = $_inc_extra $_inc_libdts $_inc_mlib
OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
STRIPBINARIES = $_stripbinaries
CHARSET = $_charset
@@ -7490,7 +7491,6 @@ LIB=\$(LIBPREF)\$(NAME)\$(LIBSUF)
X_LIB = $_ld_gl $_ld_dga $_ld_xv $_ld_xvmc $_ld_vm $_ld_xinerama $_ld_x11 $_ld_sock
GGI_LIB = $_ld_ggi
MLIB_LIB = $_ld_mlib
-MLIB_INC = $_inc_mlib
DXR2_INC = $_inc_dxr2
DVB_INC = $_inc_dvb
PNG_LIB = $_ld_png
@@ -7569,7 +7569,6 @@ X264 = $_x264
X264_INC = $_inc_x264
X264_LIB = $_ld_x264
CONFIG_DTS = $_libdts
-DTS_INC = $_inc_libdts
DTS_LIB = $_ld_libdts
DECORE_LIB = $_ld_decore $_ld_mp3lame
MENCODER = $_mencoder