Mercurial > mplayer.hg

comparison configure @ 525:4f60cf0f5148

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
png detection, Xv detect fixes
author arpi_esp
date Thu, 19 Apr 2001 19:59:11 +0000
parents e1e2131411c3
children c5c2d4e41a4a
comparison
equal deleted inserted replaced
524:9105fc95636c 525:4f60cf0f5148
182 pvendor=`cat /proc/cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2` 182 pvendor=`cat /proc/cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2`
183 pfamily=`cat /proc/cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2` 183 pfamily=`cat /proc/cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2`
184 pmodel=`cat /proc/cpuinfo | grep "model$TAB" | cut -d ':' -f 2 | cut -d ' ' -f 2` 184 pmodel=`cat /proc/cpuinfo | grep "model$TAB" | cut -d ':' -f 2 | cut -d ' ' -f 2`
185 pstepping=`cat /proc/cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2` 185 pstepping=`cat /proc/cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2`
186 186
187 _css=no
188 _mmx=no 187 _mmx=no
189 _mmx2=no 188 _mmx2=no
190 _3dnow=no 189 _3dnow=no
191 _mtrr=no 190 _mtrr=no
192 _sse=no 191 _sse=no
192
193 _mga=no 193 _mga=no
194 _gl=no 194 _gl=no
195 _sdl=no 195 _sdl=no
196 _xv=no 196 _xv=no
197 _vm=no 197 _vm=no
198 _xdpms=no
198 _3dfx=no 199 _3dfx=no
199 _syncfb=no 200 _syncfb=no
200 _mlib=no 201 _mlib=no
201 _mpg123=no 202 _mpg123=no
202 _xmga=no 203 _xmga=no
203 _dga=no 204 _dga=no
204 _dga2=no 205 _dga2=no
205 _svga=no 206 _svga=no
206 _fbdev=yes 207 _fbdev=yes
207 _lirc=no 208 _lirc=no
208 _xdpms=no 209 _css=no
209 210
210 _x=1 211 _x=1
211 _y=1 212 _y=1
212 213
213 _gllib= 214 _gllib=
402 $_cc $TMPC -o $TMPO -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes 403 $_cc $TMPC -o $TMPO -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes
403 404
404 _termcap=no 405 _termcap=no
405 $_cc $TMPC -o $TMPO -ltermcap &> /dev/null && _termcap=yes 406 $_cc $TMPC -o $TMPO -ltermcap &> /dev/null && _termcap=yes
406 407
408 _png=no
409 $_cc $TMPC -o $TMPO -lpng &> /dev/null && _png=yes
410
407 _binutils=no 411 _binutils=no
408 as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes 412 as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes
409 413
410 # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) -------------- 414 # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) --------------
411 415
415 fi 419 fi
416 420
417 if [ $_x11 = yes ]; then 421 if [ $_x11 = yes ]; then
418 422
419 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes 423 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes
420 $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes 424 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXv &> /dev/null && _xv=yes
421 425
422 $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null && _gl=yes 426 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL &> /dev/null && _gl=yes
423 427
424 cat > $TMPC << EOF 428 cat > $TMPC << EOF
425 #include <GL/gl.h> 429 #include <GL/gl.h>
426 int main( void ) { return 0; } 430 int main( void ) { return 0; }
427 EOF 431 EOF
428 $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null || \ 432 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL &> /dev/null || \
429 { _gl=no; echo "GL includes not found!";} 433 { _gl=no; echo "GL includes not found!";}
430 434
431 $_cc $TMPC -o $TMPO $_x11libdir -lXxf86vm &> /dev/null && _vm=yes 435 $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXxf86vm &> /dev/null && _vm=yes
432 436
433 cat > $TMPC << EOF 437 cat > $TMPC << EOF
434 #include <stdio.h> 438 #include <stdio.h>
435 #include <X11/Xlib.h> 439 #include <X11/Xlib.h>
436 #include <X11/extensions/xf86dga.h> 440 #include <X11/extensions/xf86dga.h>
467 do 471 do
468 case "$ac_option" in 472 case "$ac_option" in
469 --enable-css) 473 --enable-css)
470 _css=yes 474 _css=yes
471 ;; 475 ;;
476 --enable-png)
477 _png=yes
478 ;;
472 --enable-sse) 479 --enable-sse)
473 _sse=yes 480 _sse=yes
474 ;; 481 ;;
475 --enable-3dnow) 482 --enable-3dnow)
476 _3dnow=yes 483 _3dnow=yes
535 --enable-select) 542 --enable-select)
536 _select='#define HAVE_AUDIO_SELECT' 543 _select='#define HAVE_AUDIO_SELECT'
537 ;; 544 ;;
538 --disable-css) 545 --disable-css)
539 _css=no 546 _css=no
547 ;;
548 --disable-png)
549 _png=no
540 ;; 550 ;;
541 --disable-sse) 551 --disable-sse)
542 _sse=no 552 _sse=no
543 ;; 553 ;;
544 --disable-3dnow) 554 --disable-3dnow)
643 echo "Checking for DGA 2.0 .. $_dga2" 653 echo "Checking for DGA 2.0 .. $_dga2"
644 echo "Checking for Xf86VM ... $_vm" 654 echo "Checking for Xf86VM ... $_vm"
645 echo "Checking for SVGAlib ... $_svga" 655 echo "Checking for SVGAlib ... $_svga"
646 echo "Checking for FBDev ... $_fbdev" 656 echo "Checking for FBDev ... $_fbdev"
647 echo "Checking for DeCSS support ... $_css" 657 echo "Checking for DeCSS support ... $_css"
658 echo "Checking for PNG support ... $_png"
648 # write conf files. 659 # write conf files.
649 660
650 if [ $_gl = yes ]; then 661 if [ $_gl = yes ]; then
651 _gllib='-lGL' 662 _gllib='-lGL'
652 fi 663 fi
718 else 729 else
719 _lircdefs='#undef HAVE_LIRC' 730 _lircdefs='#undef HAVE_LIRC'
720 _lirclibs='' 731 _lirclibs=''
721 fi 732 fi
722 733
734 if [ $_png = yes ]; then
735 _libpng='-lpng'
736 fi
723 737
724 echo 738 echo
725 echo "Creating $MCONF" 739 echo "Creating $MCONF"
726 cat > $MCONF << EOF 740 cat > $MCONF << EOF
727 741
731 CC=$_cc 745 CC=$_cc
732 X11DIR=$_x11libdir 746 X11DIR=$_x11libdir
733 # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math 747 # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
734 OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math 748 OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math
735 # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib 749 # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib
736 X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib 750 X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib $_libpng
737 TERMCAP_LIB=$_libtermcap 751 TERMCAP_LIB=$_libtermcap
738 XMM_LIBS = $_xmmplibs 752 XMM_LIBS = $_xmmplibs
739 LIRC_LIBS = $_lirclibs 753 LIRC_LIBS = $_lirclibs
740 CSS_LIB = $_csslib 754 CSS_LIB = $_csslib
741 CSS_INC = $_cssinc 755 CSS_INC = $_cssinc
772 786
773 # --- 787 # ---
774 788
775 _vosrc='' 789 _vosrc=''
776 790
791 if [ $_png = yes ]; then
792 _png='#define HAVE_PNG'
793 _vosrc=$_vosrc' vo_png.c'
794 else
795 _png='#undef HAVE_PNG'
796 fi
797
798
777 if [ $_mlib = yes ]; then 799 if [ $_mlib = yes ]; then
778 _mlib='#define HAVE_MLIB' 800 _mlib='#define HAVE_MLIB'
779 _vosrc=$_vosrc' yuv2rgb_mlib.c' 801 _vosrc=$_vosrc' yuv2rgb_mlib.c'
780 else 802 else
781 _mlib='#undef HAVE_MLIB' 803 _mlib='#undef HAVE_MLIB'
930 // 952 //
931 ///////////////////////////////////////////////////////////////////////////// 953 /////////////////////////////////////////////////////////////////////////////
932 954
933 /* termcap flag for getch2.c */ 955 /* termcap flag for getch2.c */
934 $_termcap 956 $_termcap
957 $_png
935 958
936 /* Extension defines */ 959 /* Extension defines */
937 $_mlib // available only on solaris 960 $_mlib // available only on solaris
938 $_3dnowm // only define if you have 3DNOW (AMD k6-2, AMD Athlon, iDT WinChip, etc.) 961 $_3dnowm // only define if you have 3DNOW (AMD k6-2, AMD Athlon, iDT WinChip, etc.)
939 $_mmx // only define if you have MMX 962 $_mmx // only define if you have MMX