xf86-video-mach64: Branch 'master'

[Peter Hutterer]

 configure.ac    |    4 ++++
 src/atimach64.c |    5 +++++
 2 files changed, 9 insertions(+)

New commits:
commit 965614f27d42106e859000264a6eb89d9fcba67e
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 16 11:43:33 2009 +1000

    Update to xextproto 7.1 support.
    
    DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
    need to include dpmsconst.h if xextproto 7.1 is available.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index e22b987..68e2a5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+                  HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/atimach64.c b/src/atimach64.c
index c7b0ecc..e3897ea 100644
--- a/src/atimach64.c
+++ b/src/atimach64.c
@@ -63,10 +63,15 @@
 #include "atimach64io.h"
 #include "atirgb514.h"
 
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #ifndef DPMS_SERVER
 # define DPMS_SERVER
 #endif
 #include <X11/extensions/dpms.h>
+#endif
+
 
 /*
  * ATIMach64PreInit --