diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 12:44:57 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 12:47:02 +1000 |
| commit | ecf5ecebcfc3ec6490111876895ab3a67197e565 (patch) | |
| tree | f87124cbfd8d1d96a184a4870636de9535703403 | |
| parent | 4f881efe2ec8ae4def01014f9acf7400e93a807f (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/ffb.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 10cd570..1b4ec7a 100644 --- a/configure.ac +++ b/configure.ac @@ -60,6 +60,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. @@ -39,11 +39,14 @@ #include "ffb_regs.h" #include "xf86sbusBus.h" #include "ffb_dac.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #ifndef DPMS_SERVER #define DPMS_SERVER #endif /* DPMS_SERVER */ #include <X11/extensions/dpms.h> - +#endif /* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */ /* Note: do not mmap FFB_DFB8R_VOFF and following mappings using one mmap together |