xorg/st: fixup builds against later dpms headers.

(cherry picked from master, commit e9d6ab72be)
This commit is contained in:
Brian Paul 2009-11-18 08:07:56 -07:00
parent 2b3ea2be90
commit d449c07b8b
3 changed files with 13 additions and 0 deletions

View file

@ -1157,6 +1157,11 @@ yes)
if test "$tracker" = egl && test "x$enable_egl" != xyes; then
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
fi
if test "$tracker" = xorg; then
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71"
HAVE_XEXTPROTO_71="no")
fi
done
GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
;;

View file

@ -42,8 +42,12 @@
#include "xorg_tracker.h"
#include "xf86Modes.h"
#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "pipe/p_inlines.h"
#include "util/u_rect.h"

View file

@ -42,8 +42,12 @@
#include <sys/stat.h>
#include <sys/types.h>
#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#endif
#include "X11/Xatom.h"