Update configure / configure.ac to improve Xv detection

unix/Makefile.in

@@ -1,3 +1,4 @@
+@S9XXVIDEO@
 @S9XDEBUGGER@
 @S9XNETPLAY@
 @S9XZIP@
@@ -10,6 +11,12 @@ BUILDDIR   = .
 OBJECTS    = ../apu/apu.o ../apu/bapu/dsp/sdsp.o ../apu/bapu/dsp/SPC_DSP.o ../apu/bapu/smp/smp.o ../apu/bapu/smp/smp_state.o ../bsx.o ../c4.o ../c4emu.o ../cheats.o ../cheats2.o ../clip.o ../conffile.o ../controls.o ../cpu.o ../cpuexec.o ../cpuops.o ../crosshairs.o ../dma.o ../dsp.o ../dsp1.o ../dsp2.o ../dsp3.o ../dsp4.o ../fxinst.o ../fxemu.o ../gfx.o ../globals.o ../logger.o ../memmap.o ../movie.o ../obc1.o ../ppu.o ../stream.o ../sa1.o ../sa1cpu.o ../screenshot.o ../sdd1.o ../sdd1emu.o ../seta.o ../seta010.o ../seta011.o ../seta018.o ../snapshot.o ../snes9x.o ../spc7110.o ../srtc.o ../tile.o ../filter/2xsai.o ../filter/blit.o ../filter/epx.o ../filter/hq2x.o ../filter/snes_ntsc.o ../statemanager.o unix.o x11.o
 DEFS       = -DMITSHM
 
+ifdef S9XXVIDEO
+OBJECTS	+= x11-driver-display-xv.o
+DEFS	+= -DUSE_XVIDEO
+LIBS	+= -lXv
+endif
+
 ifdef S9XDEBUGGER
 OBJECTS   += ../debug.o ../fxdbg.o
 endif

unix/configure

@@ -626,6 +626,7 @@ S9XJMA
 S9XZIP
 S9XNETPLAY
 S9XDEBUGGER
+S9XXVIDEO
 S9XLIBS
 S9XDEFS
 S9XFLGS
@@ -5998,6 +5999,8 @@ if test "x$snes9x_sar_int8" = "xyes" -a "x$snes9x_sar_int16" = "xyes" -a "x$snes
 fi
 
 # Check if we can build with XVideo acceleration support
+S9XXVIDEO="#S9XXVIDEO=1"
+
 # Check whether --enable-xvideo was given.
 if test "${enable_xvideo+set}" = set; then :
   enableval=$enable_xvideo;
@@ -6012,8 +6015,7 @@ if test "x$enable_xvideo" = "xyes"; then
 if test "x$ac_cv_header_X11_extensions_Xv_h" = xyes; then :
 
 		enable_xvideo="yes"
-		S9XDEFS="$S9XDEFS -DUSE_XVIDEO"
+		S9XXVIDEO="S9XXVIDEO=1"
-		S9XLIBS="$S9XLIBS -lXv"
 
 fi
 
@@ -6079,6 +6081,7 @@ S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/^  *//'`"
 
 
 
+
 rm config.info 2>/dev/null
 
 cat >config.info <<EOF

unix/configure.ac

@@ -376,6 +376,8 @@ if test "x$snes9x_sar_int8" = "xyes" -a "x$snes9x_sar_int16" = "xyes" -a "x$snes
 fi
 
 # Check if we can build with XVideo acceleration support
+S9XXVIDEO="#S9XXVIDEO=1"
+
 AC_ARG_ENABLE([xvideo],
 	[AS_HELP_STRING([--enable-xvideo],
 		[enable XVideo if available (default: yes)])],
@@ -386,8 +388,7 @@ if test "x$enable_xvideo" = "xyes"; then
 	AC_CHECK_HEADER([X11/extensions/Xv.h],
 	[
 		enable_xvideo="yes"
-		S9XDEFS="$S9XDEFS -DUSE_XVIDEO"
+		S9XXVIDEO="S9XXVIDEO=1"
-		S9XLIBS="$S9XLIBS -lXv"
 	])
 fi
 
@@ -434,6 +435,7 @@ S9XLIBS="`echo \"$S9XLIBS\" | sed -e 's/^  *//'`"
 AC_SUBST(S9XFLGS)
 AC_SUBST(S9XDEFS)
 AC_SUBST(S9XLIBS)
+AC_SUBST(S9XXVIDEO)
 AC_SUBST(S9XDEBUGGER)
 AC_SUBST(S9XNETPLAY)
 AC_SUBST(S9XZIP)