Index: xf86-video-ati/configure.ac
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-ati/configure.ac,v
retrieving revision 1.15
diff -u -r1.15 configure.ac
--- xf86-video-ati/configure.ac	30 Nov 2005 18:51:22 -0000	1.15
+++ xf86-video-ati/configure.ac	1 Dec 2005 13:19:51 -0000
@@ -40,6 +40,10 @@
 AC_PROG_CC
 
 AH_TOP([#include "xorg-server.h"])
+AH_BOTTOM([/* Modular defines XV instead of XvExtension */
+#ifdef XV
+#define XvExtension 1
+#endif])
 
 AC_ARG_WITH(xorg-module-dir,
             AC_HELP_STRING([--with-xorg-module-dir=DIR],
Index: xf86-video-savage/configure.ac
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-savage/configure.ac,v
retrieving revision 1.10
diff -u -r1.10 configure.ac
--- xf86-video-savage/configure.ac	30 Nov 2005 18:51:40 -0000	1.10
+++ xf86-video-savage/configure.ac	1 Dec 2005 13:19:51 -0000
@@ -40,6 +40,10 @@
 AC_PROG_CC
 
 AH_TOP([#include "xorg-server.h"])
+AH_BOTTOM([/* Modular defines XV instead of XvExtension */
+#ifdef XV
+#define XvExtension 1
+#endif])
 
 AC_ARG_WITH(xorg-module-dir,
             AC_HELP_STRING([--with-xorg-module-dir=DIR],
Index: xf86-video-via/configure.ac
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-via/configure.ac,v
retrieving revision 1.15
diff -u -r1.15 configure.ac
--- xf86-video-via/configure.ac	30 Nov 2005 18:46:49 -0000	1.15
+++ xf86-video-via/configure.ac	1 Dec 2005 13:19:51 -0000
@@ -40,6 +40,10 @@
 AC_PROG_CC
 
 AH_TOP([#include "xorg-server.h"])
+AH_BOTTOM([/* Modular defines XV instead of XvExtension */
+#ifdef XV
+#define XvExtension 1
+#endif])
 
 AC_ARG_WITH(xorg-module-dir,
             AC_HELP_STRING([--with-xorg-module-dir=DIR],