diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:38:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:38:29 +1000 |
| commit | 48fddeb136aba247e06688d8127ee133ae3b8dd2 (patch) | |
| tree | 56d8a6f692ed20d7e1d2c3f7218d60883e79b2a5 | |
| parent | e20cb5035996b392b010f2b52aa14d004868825a (diff) | |
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@who-t.net>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/glide_driver.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f257c78..77fc250 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.0.99.901 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/glide_driver.c b/src/glide_driver.c index fac93b2..a7650c4 100644 --- a/src/glide_driver.c +++ b/src/glide_driver.c @@ -60,8 +60,13 @@ #include "micmap.h" #include "xf86DDC.h" #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "fb.h" #include "xf86cmap.h" #include "shadowfb.h" |