diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:54:36 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:54:36 +1000 |
| commit | c688ce43f935af22c23d58c692ffa501b88d9070 (patch) | |
| tree | 8b548b741f01bd81f7ba67c7212c6cae6f4dc80d | |
| parent | 15a028c2a3a57198f5b64a8ca56ba075cc834768 (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/s3v_driver.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index a312ae1..03fa1a2 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,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/s3v_driver.c b/src/s3v_driver.c index 61e2273..df5ea9b 100644 --- a/src/s3v_driver.c +++ b/src/s3v_driver.c @@ -58,8 +58,13 @@ in this Software without prior written authorization from the XFree86 Project. #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #ifndef USE_INT10 #define USE_INT10 0 |