summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-07 19:57:57 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-07 19:57:57 +0300
commitaf3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch)
tree2ead158ae6e6abfffcccf1609aa5492f9402e24f /configure
parentd5c868325cefcd5fad53361d1dfdc9757674eb70 (diff)
parent4653f5ed7575d6070b54a88b4deb449f838825b3 (diff)
downloadmpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2
mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz
Merge svn changes up to r27025
Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure71
1 files changed, 27 insertions, 44 deletions
diff --git a/configure b/configure
index 35380bdc5a..cf69c211fa 100755
--- a/configure
+++ b/configure
@@ -339,12 +339,12 @@ Codecs:
--enable-muxer=MUXER enable specified FFmpeg muxer
Video output:
- --disable-vidix-internal disable internal VIDIX [for x86 *nix]
- --disable-vidix-external disable external VIDIX [for x86 *nix]
+ --disable-vidix disable VIDIX [for x86 *nix]
--with-vidix-drivers[=*] list of VIDIX drivers to be compiled in
Available: cyberblade,ivtv,mach64,mga,mga_crtc2,
nvidia,pm2,pm3,radeon,rage128,s3,sis,unichrome
--disable-vidix-pcidb disable VIDIX PCI device name database
+ --enable-svgalib_helper enable VIDIX svgalib_helper support
--enable-gl enable OpenGL video output [autodetect]
--enable-dga2 enable DGA 2 support [autodetect]
--enable-dga1 enable DGA 1 support [autodetect]
@@ -619,9 +619,9 @@ _pvr=auto
_network=yes
_winsock2=auto
_smbsupport=auto
-_vidix_internal=auto
-_vidix_external=auto
+_vidix=auto
_vidix_pcidb=yes
+_svgalib_helper=no
_joystick=no
_xvid=auto
_xvid_lavc=auto
@@ -1016,14 +1016,14 @@ for ac_option do
--disable-winsock2) _winsock2=no ;;
--enable-smb) _smbsupport=yes ;;
--disable-smb) _smbsupport=no ;;
- --enable-vidix-internal) _vidix_internal=yes ;;
- --disable-vidix-internal) _vidix_internal=no ;;
- --enable-vidix-external) _vidix_external=yes ;;
- --disable-vidix-external) _vidix_external=no ;;
+ --enable-vidix) _vidix=yes ;;
+ --disable-vidix) _vidix=no ;;
--with-vidix-drivers=*)
_vidix_drivers=`echo $ac_option | cut -d '=' -f 2`
;;
--disable-vidix-pcidb) _vidix_pcidb=no ;;
+ --enable-svgalib_helper) _svgalib_helper=yes ;;
+ --disable-svgalib_helper) _svgalib_helper=no ;;
--enable-joystick) _joystick=yes ;;
--disable-joystick) _joystick=no ;;
--enable-xvid) _xvid=yes ;;
@@ -4193,7 +4193,6 @@ echores "$_gl"
echocheck "VIDIX"
-_vidix=no
_def_vidix='#undef CONFIG_VIDIX'
_def_vidix_drv_cyberblade='#undef CONFIG_VIDIX_DRV_CYBERBLADE'
_vidix_drv_cyberblade=no
@@ -4223,24 +4222,11 @@ _def_vidix_drv_sis='#undef CONFIG_VIDIX_DRV_SIS'
_vidix_drv_sis=no
_def_vidix_drv_unichrome='#undef CONFIG_VIDIX_DRV_UNICHROME'
_vidix_drv_unichrome=no
-if test "$_vidix_internal" = auto ; then
- _vidix_internal=no
+if test "$_vidix" = auto ; then
+ _vidix=no
x86 && (linux || freebsd || netbsd || openbsd || dragonfly || sunos || win32) \
- && _vidix_internal=yes
- (ppc || alpha) && linux && _vidix_internal=yes
-fi
-if test "$_vidix_internal" = yes; then
- _res_comment="internal"
- _vidix_external=no
- _vidix=yes
-elif test "$_vidix_external" = auto; then
- _vidix_external=no
- cat > $TMPC <<EOF
-#include <vidix/vidix.h>
-int main(void) { return 0; }
-EOF
- cc_check -lvidix && _vidix_external=yes && _res_comment="external" \
- && _vidix=yes
+ && _vidix=yes
+ (ppc || alpha) && linux && _vidix=yes
fi
echores "$_vidix"
@@ -4259,17 +4245,23 @@ if test "$_vidix" = yes ; then
eval _vidix_drv_${driver}=yes
eval _def_vidix_drv_${driver}=\"\#define CONFIG_VIDIX_DRV_${uc_driver} 1\"
done
+
+ echocheck "VIDIX PCI device name database"
+ echores "$_vidix_pcidb"
+ if test "$_vidix_pcidb" = yes ; then
+ _vidix_pcidb_val=1
+ else
+ _vidix_pcidb_val=0
+ fi
+
+ echocheck "VIDIX svgalib_helper support"
+ test "$_svgalib_helper" = yes && cflag_svgalib_helper=-DCONFIG_SVGAHELPER
+ echores "$_svgalib_helper"
+
else
_novomodules="cvidix $_novomodules"
fi
-if test "$_vidix_internal" = yes ; then
- _def_vidix_pfx="#define MP_VIDIX_PFX \"$_libdir\" \"/mplayer/vidix/\" "
-elif test "$_vidix_external" = yes ; then
- _libs_mplayer="$_libs_mplayer -lvidix"
- _def_vidix_pfx='#define MP_VIDIX_PFX "" '
-fi
-
if test "$_vidix" = yes && win32; then
_vosrc="$_vosrc vo_winvidix.c"
_vomodules="winvidix $_vomodules"
@@ -4284,14 +4276,6 @@ else
_novomodules="xvidix $_novomodules"
fi
-echocheck "VIDIX PCI device name database"
-echores "$_vidix_pcidb"
-if test "$_vidix_pcidb" = yes ; then
- _vidix_pcidb_val=1
-else
- _vidix_pcidb_val=0
-fi
-
echocheck "/dev/mga_vid"
if test "$_mga" = auto ; then
_mga=no
@@ -7580,7 +7564,7 @@ cat > config.mak << EOF
# -------- Generated by configure -----------
# Ensure that locale settings do not interfere with shell commands.
-LC_ALL = C
+export LC_ALL = C
MAN_LANG = $MAN_LANG
MAN_LANG_ALL = $MAN_LANG_ALL
@@ -7611,6 +7595,7 @@ CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER
CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
CFLAG_STACKREALIGN = $_stackrealign
LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
+CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper
ASFLAGS = $ASFLAGS
EXTRALIBS = $_extra_libs
@@ -7730,8 +7715,6 @@ TWOLAME=$_twolame
UNRAR_EXEC = $_unrar_exec
VCD = $_vcd
VIDIX = $_vidix
-VIDIX_EXTERNAL = $_vidix_external
-VIDIX_INTERNAL = $_vidix_internal
VIDIX_PCIDB = $_vidix_pcidb_val
VIDIX_CYBERBLADE=$_vidix_drv_cyberblade
VIDIX_IVTV=$_vidix_drv_ivtv