Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv14452 Modified Files: configure Log Message: divx4linux autodetection Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- configure 30 Jul 2001 14:53:07 -0000 1.124 +++ configure 31 Jul 2001 22:20:43 -0000 1.125 @@ -755,15 +755,18 @@ fi fi fi - + +_divx4linux=no +$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -ldivxdecore > /dev/null 2>&1 && _divx4linux=yes + _termcap=no -$_cc $TMPC -o $TMPO -ltermcap > /dev/null 2>&1 && _termcap=yes +$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -ltermcap > /dev/null 2>&1 && _termcap=yes _png=no -$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lpng -lz -lm > /dev/null 2>&1 && _png=yes +$_cc $_extraincdir $_extralibdir $_extraincdir $_extralibdir $TMPC -o $TMPO -lpng -lz -lm > /dev/null 2>&1 && _png=yes _ggi=no -$_cc $TMPC -o $TMPO -lggi > /dev/null 2>&1 && _ggi=yes +$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lggi > /dev/null 2>&1 && _ggi=yes _kstat=no $_cc $TMPC -o $TMPO -lkstat >/dev/null 2>&1 && _kstat=yes _archlibs="-lkstat $_archlibs" @@ -1360,6 +1363,7 @@ echo "Checking for PNG support ... $_png" echo "Checking for DirectShow ... $_dshow" echo "Checking for libavcodec ... $_libavcodec" +echo "Checking for divx4linux ... $_divx4linux" echo "Checking for fastmemcpy ... $_fastmemcpy" echo "Extra libs : $_extralibdir" echo "Extra headers : $_extraincdir" @@ -1745,6 +1749,16 @@ _gui='#undef HAVE_GUI' fi +if [ $_divx4linux = yes ]; then + _divx4def='#define NEW_DECORE' + _decorelibs='-ldivxdecore opendivx/postprocess.o' +else + _divx4def='#undef NEW_DECORE' + _decorelibs='-Lopendivx -ldecore' +# _postproc='#undef MPEG12_POSTPROC' +fi + + _postproc='#define MPEG12_POSTPROC' echo echo "Creating $MCONF" @@ -1778,8 +1792,8 @@ ESD_LIB = $_esdlib ARCH_LIBS = $_archlibs STREAM_SRCS = $_streamingsrcs -DECORE_LIBS = -Lopendivx -ldecore -# DECORE_LIBS=-L/usr/local/lib -ldivxdecore +DECORE_LIBS = $_decorelibs +DIVX4LINUX=$_divx4linux # --- Some stuff for autoconfigure ---- $_target_arch @@ -1805,7 +1819,7 @@ /* Define for using new DivX4Linux library, instead of open-source OpenDivX */ /* You have to change DECORE_LIBS in config.mak too! */ -#undef NEW_DECORE +$_divx4def /* Define this to enable avg. byte/sec-based AVI sync method by default: (use -bps or -nobps commandline option for run-time method selection) */ @@ -1872,7 +1886,7 @@ $_css /* Define this to enable MPEG 1/2 image postprocessing (requires FAST cpu!) */ -#define MPEG12_POSTPROC +$_postproc /* DirectShow support */ $_dshow