Mercurial > mplayer.hg

changeset 24361:15da64a537de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move vo_3dfx check after vo_dga check, vo_3dfx needs -lXxf86dga to link.
author diego
date Sun, 09 Sep 2007 10:18:18 +0000
parents ba7da0656d80
children 93d5f228ff82
files configure
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Sep 09 09:59:50 2007 +0000
+++ b/configure	Sun Sep 09 10:18:18 2007 +0000
@@ -3668,18 +3668,6 @@
 #########
 
 
-echocheck "3dfx"
-if test "$_3dfx" = yes ; then
-  _def_3dfx='#define HAVE_3DFX 1'
-  _vosrc="$_vosrc vo_3dfx.c"
-  _vomodules="3dfx $_vomodules"
-else
-  _def_3dfx='#undef HAVE_3DFX'
-  _novomodules="3dfx $_novomodules"
-fi
-echores "$_3dfx"
-
-
 echocheck "tdfxfb"
 if test "$_tdfxfb" = yes ; then
   _def_tdfxfb='#define HAVE_TDFXFB 1'
@@ -4103,6 +4091,18 @@
 echores "$_dga"
 
 
+echocheck "3dfx"
+if test "$_3dfx" = yes && test "$_dga" = yes ; then
+  _def_3dfx='#define HAVE_3DFX 1'
+  _vosrc="$_vosrc vo_3dfx.c"
+  _vomodules="3dfx $_vomodules"
+else
+  _def_3dfx='#undef HAVE_3DFX'
+  _novomodules="3dfx $_novomodules"
+fi
+echores "$_3dfx"
+
+
 echocheck "OpenGL"
 #Note: this test is run even with --enable-gl since we autodetect linker flags
 if (test "$_x11" = yes || win32) && test "$_gl" != no ; then