diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-04 10:57:33 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-04 12:51:02 +1000 |
| commit | 6fb01c8286c16968fd07e4a5b78da89cd8768d79 (patch) | |
| tree | bc70c652f512eefea9f773a3c43db53363907dd9 | |
| parent | 2122fedb2c058dc27f9df0e856d2193fabe725e2 (diff) | |
require xf86vidmodeproto 2.2.99.1 or newer.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.h | 3 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/xf86vmode.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 097e7806d..181a86139 100644 --- a/configure.ac +++ b/configure.ac @@ -1523,11 +1523,11 @@ if test "x$XORG" = xyes; then fi if test "x$XF86VIDMODE" = xauto; then - PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto, [XF86VIDMODE=yes], [XF86VIDMODE=no]) + PKG_CHECK_MODULES(XF86VIDMODE, [xf86vidmodeproto >= 2.2.99.1], [XF86VIDMODE=yes], [XF86VIDMODE=no]) fi if test "x$XF86VIDMODE" = xyes; then XORG_MODULES="$XORG_MODULES xf86vidmodeproto" - PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto) + PKG_CHECK_MODULES(XF86VIDMODE, [xf86vidmodeproto >= 2.2.99.1]) AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension]) fi diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 229217535..6210526aa 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -30,8 +30,7 @@ extern void ScreenSaverExtensionInit (INITARGS); #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); -#define _XF86VIDMODE_SERVER_ -#include <X11/extensions/xf86vmstr.h> +#include <X11/extensions/xf86vmproto.h> #endif #ifdef XFreeXDGA diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 2e82f331a..4a288d79f 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -41,8 +41,7 @@ from Kaleb S. KEITHLEY #include "extnsionst.h" #include "scrnintstr.h" #include "servermd.h" -#define _XF86VIDMODE_SERVER_ -#include <X11/extensions/xf86vmstr.h> +#include <X11/extensions/xf86vmproto.h> #include "swaprep.h" #include "xf86.h" #include "vidmodeproc.h" |