diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-06 00:07:53 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-06 00:07:53 +0000 |
commit | c99948e1d686778d072d4f7fa866d988ce42c965 (patch) | |
tree | e1cbcd7077e37f40ea21a48307bfea0f8dd513b6 | |
parent | f15d5ddc822816435c69b863577bc696d84b6acd (diff) | |
download | mpv-c99948e1d686778d072d4f7fa866d988ce42c965.tar.bz2 mpv-c99948e1d686778d072d4f7fa866d988ce42c965.tar.xz |
better divx4 detection, --disable-divx4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1444 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 21 |
1 files changed, 18 insertions, 3 deletions
@@ -850,6 +850,17 @@ $_cc $_x11incdir $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lX fi +cat > $TMPC << EOF +#include <decore.h> +int main( void ) { return 0; } +EOF +$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 || \ + { _gl=no; echo "GL includes not found!";} + +$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -ldivxdecore > /dev/null 2>&1 || \ + { _divx4linux=no; echo "DivX4Linux includes (decore.h) not found!";} + + rm -f $TMPC $TMPO @@ -1164,6 +1175,12 @@ for ac_option do --disable-sunaudio) _sun_audio=no ;; + --disable-divx4) + _divx4linux=no + ;; + --enable-divx4) + _divx4linux=yes + ;; --with-win32libdir=*) _win32libdir=`echo $ac_option | cut -d '=' -f 2` _win32libdirnotify=no @@ -1772,10 +1789,8 @@ if [ $_divx4linux = yes ]; then else _divx4def='#undef NEW_DECORE' _decorelibs='-Lopendivx -ldecore' -# _postproc='#undef MPEG12_POSTPROC' fi - _postproc='#define MPEG12_POSTPROC' echo echo "Creating $MCONF" @@ -1904,7 +1919,7 @@ $_lircdefs $_css /* Define this to enable MPEG 1/2 image postprocessing (requires FAST cpu!) */ -$_postproc +#define MPEG12_POSTPROC /* DirectShow support */ $_dshow |