xf86-video-vermilion: Branch 'master'

[Peter Hutterer]

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

New commits:
commit 083e15c44cc722aae7b6d02fc4856a3f2d0f5153
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jul 16 11:58:18 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 7c4ae4f..2b37727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3.99.0 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/vermilion.c b/src/vermilion.c
index 6686b59..03f77b6 100644
--- a/src/vermilion.c
+++ b/src/vermilion.c
@@ -59,8 +59,13 @@
 #include "xf86cmap.h"
 
 /* DPMS */
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
 #define DPMS_SERVER
 #include <X11/extensions/dpms.h>
+#endif
+
 #include "xf86Priv.h"
 
 #define KERNELNAME "Vermilion Range"