xf86-video-r128: Branch 'master'

[Peter Hutterer]

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

New commits:
commit 178e6f509bb8b351cfa01425ada7331781843954
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 16 11:51:08 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 eed1586..0d1f125 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,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/r128_driver.c b/src/r128_driver.c
index f42acb6..90e2246 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -101,8 +101,13 @@
 #include "dixstruct.h"
 
 				/* DPMS support. */
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 
 #ifndef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))