diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:37:34 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:38:21 +1000 |
| commit | df4745e5565b98cea278f33001f38a64e027e4ce (patch) | |
| tree | 8b4b859b6a792ed80d8f4781d0d527d7972a1352 | |
| parent | 3d9dd15cf30832bdb467e8fe02327f474e1e2130 (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/geode_driver.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 057df0f..4b8291b 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server 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/geode_driver.c b/src/geode_driver.c index e56e7c4..9c0611b 100644 --- a/src/geode_driver.c +++ b/src/geode_driver.c @@ -72,8 +72,13 @@ #ifdef DPMSExtension #include "globals.h" #include "opaque.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #endif /* DPMSExtension */ /* A few things all drivers should have */ |