mplayer.hg: configure comparison

comparison configure @ 3206:588102344a68

DGA handling changed (Arpi's request) correct options: --enable-dga => auto (default) --enable-dga=1 or ...=2 --disable-dga changed --enable/disable-select handling to behave as the other tests

author	pl
date	Thu, 29 Nov 2001 18:56:08 +0000
parents	039a973b3dda
children	6ea45643506c

comparison

equal deleted inserted replaced

-:1d2b2885bb8c
+:588102344a68
 --disable-iconv        do not use iconv(3) function [autodetect]
 --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
 Video:
 --enable-gl            build with OpenGL render support [autodetect]
---enable-dga           build with DGA support [autodetect]
+--enable-dga[=n]       build with DGA [n in {1, 2} ] support [autodetect]
 --enable-svga          build with SVGAlib support [autodetect]
 --enable-sdl           build with SDL render support [autodetect]
 --enable-aa            build with AAlib render support [autodetect]
 --enable-ggi           build with GGI render support [autodetect]
 --enable-dxr3		 build with DXR3/H+ render support [autodetect]
 fi
 _prefix="/usr/local"
+# GOTCHA: the variables below defines the default behavior for autodetection
+# and have - unless stated otherwise - at least 2 states : yes no
+# If autodetection is available then the third state is: auto
 _libavcodec=auto
 _libavcodecso=no # changed default to no as it causes problems - atmos
 _mencoder=auto
 _x11=auto
-_dga=auto
+_dga=auto	# 1 2 no auto
-_dga2=auto
 _xv=auto
 _sdl=auto
 _png=auto
 _gl=auto
 _ggi=auto
 _sunaudio=auto
 _alsa=auto
 _fastmemcpy=yes
 _win32=auto
 _dshow=auto
-_def_select='#define HAVE_AUDIO_SELECT'
+_select=yes
 _tv=no
 _streaming=no
 _divx4linux=auto
 _lirc=auto
 _gui=no
 # Real 2nd pass
 --enable-mencoder)	_mencoder=yes	;;
 --disable-mencoder)	_mencoder=no	;;
 --enable-x11)		_x11=yes	;;
 --disable-x11)	_x11=no		;;
---enable-dga)		_dga=yes	;;
---disable-dga)	_dga=no		;;
---enable-dga2)	_dga2=yes	;;
---disable-dga2)	_dga2=no	;;
 --enable-xv)		_xv=yes		;;
 --disable-xv)		_xv=no		;;
 --enable-sdl)		_sdl=yes	;;
 --disable-sdl)	_sdl=no		;;
 --enable-png)		_png=yes	;;
 --disable-largefiles)	_largefiles=no	;;
 --enable-vo2)		_vo2=yes	;;
 --disable-vo2)	_vo2=no		;;
 --enable-shm)		_shm=yes	;;
 --disable-shm)	_shm=no         ;;
+--enable-select)	_select=yes	;;
---enable-select)	_def_select='#define HAVE_AUDIO_SELECT'	;;
+--disable-select)	_select=no	;;
---disable-select)	_def_select='#undef HAVE_AUDIO_SELECT'	;;
+--enable-dga) _dga=auto ;; # as we don't know if it's 1 or 2
+--enable-dga=*) _dga=`echo $ac_option | cut -d '=' -f 2` ;;
+--disable-dga) _dga=no ;;
 --language=*)
 LINGUAS=`echo $ac_option | cut -d '=' -f 2`
 ;;
 fi
 echores "$_vm"
 echocheck "DGA"
-if test "$_x11" = yes && test "$_dga" != no ; then
+# Version 2 is preferred to version 1 if available
+if test "$_dga" = auto ; then
 cat > $TMPC << EOF
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86dga.h>
-int main (void) { (void) XDGAQueryExtension(0, 0, 0); return 0; }
+int main (void) { (void) XF86DGASetViewPort(0, 0, 0, 0); return 0; }
 EOF
 _dga=no
-cc_check $_inc_x11 $_ld_x11 -lXxf86dga -lXxf86vm && _dga=yes
+cc_check $_inc_x11 $_ld_x11 -lXxf86dga -lXxf86vm && _dga=1
-else
-_dga=no
+cat > $TMPC << EOF
-fi
+#include <X11/Xlib.h>
-if test "$_dga" = yes ; then
+#include <X11/extensions/xf86dga.h>
+int main (void) { (void) XDGASetViewport(0, 0, 0, 0, 0); return 0; }
+EOF
+cc_check $_inc_x11 $_ld_x11 -lXxf86dga && _dga=2
+fi
+_def_dga='#undef HAVE_DGA'
+_def_dga2='#undef HAVE_DGA2'
+if test "$_dga" = 1 ; then
 _def_dga='#define HAVE_DGA 1'
 _ld_dga='-lXxf86dga -lXxf86vm'
 _vosrc="$_vosrc vo_dga.c"
 _vomodules="dga $_vomodules"
-else
+echores "using DGA 1.0"
-_def_dga='#undef HAVE_DGA'
+elif test "$_dga" = 2 ; then
-fi
-echores "$_dga"
-echocheck "DGA 2.0"
-if test "$_x11" = yes && test "$_dga2" != no ; then
-cat > $TMPC << EOF
-#include <X11/Xlib.h>
-#include <X11/extensions/xf86dga.h>
-int main (void) { XDGAMode mode; XDGADevice device; return 0; }
-EOF
-_dga2=no
-cc_check $_inc_x11 $_ld_x11 -lXxf86dga -lXxf86vm && _dga2=yes
-fi
-if test "$_dga2" = yes ; then
 _def_dga2='#define HAVE_DGA2 1'
-_ld_dga2='-lXxf86dga -lXxf86vm'
+_ld_dga='-lXxf86dga'
 _vosrc="$_vosrc vo_dga.c"
-_vomodules="dga2 $_vomodules"
+_vomodules="dga $_vomodules"
-else
+echores "using DGA 2.0"
-_def_dga2='#undef HAVE_DGA2'
+elif test "$_dga" = no ; then
-fi
+echores "no"
-echores "$_dga2"
+else
+die "DGA version must be 1 or 2"
+fi
 echocheck "OpenGL"
 #Note: this test is run even with --enable-gl since we autodetect $_ld_gl
 if test "$_x11" = yes && test "$_gl" != no ; then
 _def_tv='#define USE_TV 1'
 else
 _def_tv='#undef USE_TV'
 fi
 echores "$_tv"
+echocheck "select"
+if test "$_select" = no ; then
+_def_select='#undef HAVE_AUDIO_SELECT'
+elif test  "$_select" = yes ; then
+_def_select='#define HAVE_AUDIO_SELECT 1'
+fi
+echores "$_select"
 echocheck "streaming"
 # FIXME streaming check
 if test "$_streaming" = yes ; then
 X11_INC = $_inc_x11
 X11DIR = $_ld_x11
 # video output
-X_LIB = $_ld_x11 $_ld_gl $_ld_dga $_ld_dga2 $_ld_xv $_ld_vm $_ld_xinerama $_ld_mad $_ld_sock
+X_LIB = $_ld_x11 $_ld_gl $_ld_dga $_ld_xv $_ld_vm $_ld_xinerama $_ld_mad $_ld_sock
 DXR3_LIB =  $_ld_dxr3
 GGI_LIB = $_ld_ggi
 MLIB_LIB =  $_ld_mlib
 PNG_LIB = $_ld_png
 SDL_LIB = $_ld_sdl

Mercurial > mplayer.hg

comparison configure @ 3206:588102344a68