Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv7655 Modified Files: configure Log Message: png detection, Xv detect fixes Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** configure 2001/04/18 20:50:18 1.25 --- configure 2001/04/19 19:59:11 1.26 *************** *** 185,189 **** pstepping=`cat /proc/cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2` - _css=no _mmx=no _mmx2=no --- 185,188 ---- *************** *** 191,194 **** --- 190,194 ---- _mtrr=no _sse=no + _mga=no _gl=no *************** *** 196,199 **** --- 196,200 ---- _xv=no _vm=no + _xdpms=no _3dfx=no _syncfb=no *************** *** 206,210 **** _fbdev=yes _lirc=no ! _xdpms=no _x=1 --- 207,211 ---- _fbdev=yes _lirc=no ! _css=no _x=1 *************** *** 405,408 **** --- 406,412 ---- $_cc $TMPC -o $TMPO -ltermcap &> /dev/null && _termcap=yes + _png=no + $_cc $TMPC -o $TMPO -lpng &> /dev/null && _png=yes + _binutils=no as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes *************** *** 418,424 **** $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null && _gl=yes cat > $TMPC << EOF --- 422,428 ---- $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXv &> /dev/null && _xv=yes ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL &> /dev/null && _gl=yes cat > $TMPC << EOF *************** *** 426,433 **** int main( void ) { return 0; } EOF ! $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null || \ { _gl=no; echo "GL includes not found!";} ! $_cc $TMPC -o $TMPO $_x11libdir -lXxf86vm &> /dev/null && _vm=yes cat > $TMPC << EOF --- 430,437 ---- int main( void ) { return 0; } EOF ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL &> /dev/null || \ { _gl=no; echo "GL includes not found!";} ! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXxf86vm &> /dev/null && _vm=yes cat > $TMPC << EOF *************** *** 470,473 **** --- 474,480 ---- _css=yes ;; + --enable-png) + _png=yes + ;; --enable-sse) _sse=yes *************** *** 539,542 **** --- 546,552 ---- _css=no ;; + --disable-png) + _png=no + ;; --disable-sse) _sse=no *************** *** 646,649 **** --- 656,660 ---- echo "Checking for FBDev ... $_fbdev" echo "Checking for DeCSS support ... $_css" + echo "Checking for PNG support ... $_png" # write conf files. *************** *** 721,724 **** --- 732,738 ---- fi + if [ $_png = yes ]; then + _libpng='-lpng' + fi echo *************** *** 734,738 **** OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib ! X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib TERMCAP_LIB=$_libtermcap XMM_LIBS = $_xmmplibs --- 748,752 ---- OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib ! X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng TERMCAP_LIB=$_libtermcap XMM_LIBS = $_xmmplibs *************** *** 775,778 **** --- 789,800 ---- _vosrc='' + if [ $_png = yes ]; then + _png='#define HAVE_PNG' + _vosrc=$_vosrc' vo_png.c' + else + _png='#undef HAVE_PNG' + fi + + if [ $_mlib = yes ]; then _mlib='#define HAVE_MLIB' *************** *** 933,936 **** --- 955,959 ---- /* termcap flag for getch2.c */ $_termcap + $_png /* Extension defines */ _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog