comparison configure @ 4211:2c1ca684ff04

zr en/disable, libjpeg detection - patch by Rik Snel <rsnel@cube.dyndns.org>
author arpi
date Thu, 17 Jan 2002 01:27:20 +0000
parents b47f7697541d
children 2b141fcd69dd
comparison
equal deleted inserted replaced
4210:d43f0e4ac781 4211:2c1ca684ff04
152 --enable-fbdev=nocopy yuv12 converts directly into framebuffer 152 --enable-fbdev=nocopy yuv12 converts directly into framebuffer
153 --enable-mlib build with MLIB support (Solaris only) [autodetect] 153 --enable-mlib build with MLIB support (Solaris only) [autodetect]
154 --enable-3dfx build with 3dfx support [disable] 154 --enable-3dfx build with 3dfx support [disable]
155 --enable-tdfxfb build with tdfxfb support [disable] 155 --enable-tdfxfb build with tdfxfb support [disable]
156 --enable-directfb build with DirectFB support [autodetect] 156 --enable-directfb build with DirectFB support [autodetect]
157 --enable-zr build with ZR36067/ZR36060 support [disable]
157 158
158 Audio: 159 Audio:
159 --disable-ossaudio disable OSS sound support [autodetect] 160 --disable-ossaudio disable OSS sound support [autodetect]
160 --disable-alsa disable alsa sound support [autodetect] 161 --disable-alsa disable alsa sound support [autodetect]
161 --disable-sunaudio disable Sun sound support [autodetect] 162 --disable-sunaudio disable Sun sound support [autodetect]
671 _x11=auto 672 _x11=auto
672 _dga=auto # 1 2 no auto 673 _dga=auto # 1 2 no auto
673 _xv=auto 674 _xv=auto
674 _sdl=auto 675 _sdl=auto
675 _nas=auto 676 _nas=auto
677 _jpeg=auto
676 _png=auto 678 _png=auto
677 _gl=auto 679 _gl=auto
678 _ggi=auto 680 _ggi=auto
679 _aa=auto 681 _aa=auto
680 _svga=auto 682 _svga=auto
712 _termcap=auto 714 _termcap=auto
713 _termios=auto 715 _termios=auto
714 _3dfx=no 716 _3dfx=no
715 _tdfxfb=no 717 _tdfxfb=no
716 _directfb=auto 718 _directfb=auto
719 _zr=no
717 _largefiles=no 720 _largefiles=no
718 _vo2=no 721 _vo2=no
719 _language=en 722 _language=en
720 _shm=auto 723 _shm=auto
721 724
742 --disable-xv) _xv=no ;; 745 --disable-xv) _xv=no ;;
743 --enable-sdl) _sdl=yes ;; 746 --enable-sdl) _sdl=yes ;;
744 --disable-sdl) _sdl=no ;; 747 --disable-sdl) _sdl=no ;;
745 --enable-nas) _nas=yes ;; 748 --enable-nas) _nas=yes ;;
746 --disable-nas) _nas=no ;; 749 --disable-nas) _nas=no ;;
750 --enable-jpeg) _jpeg=yes ;;
751 --disable-jpeg) _jpeg=no ;;
747 --enable-png) _png=yes ;; 752 --enable-png) _png=yes ;;
748 --disable-png) _png=no ;; 753 --disable-png) _png=no ;;
749 --enable-gl) _gl=yes ;; 754 --enable-gl) _gl=yes ;;
750 --disable-gl) _gl=no ;; 755 --disable-gl) _gl=no ;;
751 --enable-ggi) _ggi=yes ;; 756 --enable-ggi) _ggi=yes ;;
819 --disable-3dfx) _3dfx=no ;; 824 --disable-3dfx) _3dfx=no ;;
820 --enable-tdfxfb) _tdfxfb=yes ;; 825 --enable-tdfxfb) _tdfxfb=yes ;;
821 --disable-tdfxfb) _tdfxfb=no ;; 826 --disable-tdfxfb) _tdfxfb=no ;;
822 --enable-directfb) _directfb=yes ;; 827 --enable-directfb) _directfb=yes ;;
823 --disable-directfb) _directfb=no ;; 828 --disable-directfb) _directfb=no ;;
829 --enable-zr) _zr=yes ;;
830 --disable-zr) _zr=no ;;
824 --enable-mtrr) _mtrr=yes ;; 831 --enable-mtrr) _mtrr=yes ;;
825 --disable-mtrr) _mtrr=no ;; 832 --disable-mtrr) _mtrr=no ;;
826 --enable-largefiles) _largefiles=yes ;; 833 --enable-largefiles) _largefiles=yes ;;
827 --disable-largefiles) _largefiles=no ;; 834 --disable-largefiles) _largefiles=no ;;
828 --enable-vo2) _vo2=yes ;; 835 --enable-vo2) _vo2=yes ;;
1823 _def_dvb='#undef HAVE_DVB' 1830 _def_dvb='#undef HAVE_DVB'
1824 _vomodules="mpegpes(file) $_vomodules" 1831 _vomodules="mpegpes(file) $_vomodules"
1825 fi 1832 fi
1826 echores "$_dvb" 1833 echores "$_dvb"
1827 1834
1835 echocheck "JPEG support"
1836 if test "$_jpeg" = auto; then
1837 _jpeg=no
1838 cat > $TMPC << EOF
1839 #include <stdio.h>
1840 #include <jpeglib.h>
1841 int main(void) { return 0; }
1842 EOF
1843 cc_check -ljpeg && _jpeg=yes
1844 fi
1845 echores "$_jpeg"
1846
1847 echocheck "zr"
1848 if test "$_zr" = yes ; then
1849 if test "$_jpeg" = yes ; then
1850 _ld_jpeg='-ljpeg'
1851 _def_zr='#define HAVE_ZR 1'
1852 _vosrc="$_vosrc vo_zr.c"
1853 _vomodules="zr $_vomodules"
1854 echores "$_zr"
1855 else
1856 echores "jpeglib is required by zr, sorry"
1857 _def_zr='#undef HAVE_ZR'
1858 fi
1859 else
1860 _def_zr='#undef HAVE_ZR'
1861 echores "$_zr"
1862 fi
1828 1863
1829 echocheck "PNG support" 1864 echocheck "PNG support"
1830 if test "$_png" = auto ; then 1865 if test "$_png" = auto ; then
1831 _png=no 1866 _png=no
1832 if irix ; then 1867 if irix ; then
2798 CONFDIR = $_confdir 2833 CONFDIR = $_confdir
2799 AR = ar 2834 AR = ar
2800 CC = $_cc 2835 CC = $_cc
2801 AWK = $_awk 2836 AWK = $_awk
2802 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math 2837 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
2803 OPTFLAGS = $CFLAGS 2838 OPTFLAGS = -Djpeg_fdct_ifast=jpeg_fdct_ifast2 $CFLAGS
2804 EXTRA_INC = $_inc_extra $_inc_gtk 2839 EXTRA_INC = $_inc_extra $_inc_gtk
2805 WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\" 2840 WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\"
2806 2841
2807 STREAMING = $_streaming 2842 STREAMING = $_streaming
2808 STREAMING_LIB = $_ld_streaming 2843 STREAMING_LIB = $_ld_streaming
2821 # video output 2856 # video output
2822 X_LIB = $_ld_x11 $_ld_gl $_ld_dga $_ld_xv $_ld_vm $_ld_xinerama $_ld_mad $_ld_sock 2857 X_LIB = $_ld_x11 $_ld_gl $_ld_dga $_ld_xv $_ld_vm $_ld_xinerama $_ld_mad $_ld_sock
2823 GGI_LIB = $_ld_ggi 2858 GGI_LIB = $_ld_ggi
2824 MLIB_LIB = $_ld_mlib 2859 MLIB_LIB = $_ld_mlib
2825 MLIB_INC = $_inc_mlib 2860 MLIB_INC = $_inc_mlib
2861 JPEG_LIB = $_ld_jpeg
2826 PNG_LIB = $_ld_png 2862 PNG_LIB = $_ld_png
2827 SDL_LIB = $_ld_sdl 2863 SDL_LIB = $_ld_sdl
2828 SVGA_LIB = $_ld_svga 2864 SVGA_LIB = $_ld_svga
2829 AA_LIB = $_ld_aa 2865 AA_LIB = $_ld_aa
2830 2866
3138 $_def_sdlbuggy 3174 $_def_sdlbuggy
3139 $_def_ggi 3175 $_def_ggi
3140 $_def_3dfx 3176 $_def_3dfx
3141 $_def_tdfxfb 3177 $_def_tdfxfb
3142 $_def_directfb 3178 $_def_directfb
3179 $_def_zr
3143 $_def_mga 3180 $_def_mga
3144 $_def_xmga 3181 $_def_xmga
3145 $_def_syncfb 3182 $_def_syncfb
3146 $_def_fbdev 3183 $_def_fbdev
3147 $_def_fbdev_nocopy 3184 $_def_fbdev_nocopy