summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--src/ffb.h5
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.
diff --git a/src/ffb.h b/src/ffb.h
index ea1b7fc..a2c3ada 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -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