diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:49:24 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:49:24 +1000 |
| commit | 957b8c1a240884b26ee5b91856c251622cc0b2a7 (patch) | |
| tree | f5cc504dddec789f26e9ba228d08b3694abe03eb | |
| parent | e8d4dd85de02c689d3e0cc86a99aae6e61a7d17e (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/g80_dac.c | 5 | ||||
| -rw-r--r-- | src/g80_driver.c | 5 | ||||
| -rw-r--r-- | src/g80_sor.c | 5 |
4 files changed, 19 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 3c874fe..839512b 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/g80_dac.c b/src/g80_dac.c index 404f178..307e412 100644 --- a/src/g80_dac.c +++ b/src/g80_dac.c @@ -27,8 +27,13 @@ #include <unistd.h> +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <xf86_OSproc.h> #include "g80_type.h" diff --git a/src/g80_driver.c b/src/g80_driver.c index 5ecf895..7e06358 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -36,8 +36,13 @@ #include <micmap.h> #include <xf86cmap.h> #include <fb.h> +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "nv_const.h" #include "g80_type.h" diff --git a/src/g80_sor.c b/src/g80_sor.c index c1ef42d..185761f 100644 --- a/src/g80_sor.c +++ b/src/g80_sor.c @@ -25,8 +25,13 @@ #include "config.h" #endif +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <X11/Xatom.h> #include "g80_type.h" |