diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 16:27:55 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-09-21 19:31:15 -0700 |
| commit | f9eaeadea17cb96ab85ee6cc0b5aa3867a832bcc (patch) | |
| tree | 8315d4867d808516f6b7b47a3d142080dbb1fc12 | |
| parent | bd89c302aa44c5a7a6e5f5d6e6f131e04b8e61c1 (diff) | |
Use xf86vmproto.h instead of xf86vmstr.h if it is installed
Clears warnings when built with xf86vidmodeproto 2.2.99.1 & later
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xdpyinfo.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dfd8c83..0ed78b0 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ PKG_CHECK_MODULES(DPY_XKB, x11, PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $DPY_XF86VIDMODE_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h],,,[#include <X11/Xlib.h>]) + AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h X11/extensions/xf86vmproto.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) AC_ARG_WITH(dga, AC_HELP_STRING([--without-dga],[Disable dga support.]), @@ -46,7 +46,8 @@ in this Software without prior written authorization from The Open Group. # define XKB # endif -# if HAVE_X11_EXTENSIONS_XF86VMODE_H && HAVE_X11_EXTENSIONS_XF86VMSTR_H +# if HAVE_X11_EXTENSIONS_XF86VMODE_H && \ + (HAVE_X11_EXTENSIONS_XF86VMSTR_H || HAVE_X11_EXTENSIONS_XF86VMPROTO_H) # define XF86VIDMODE # endif @@ -104,7 +105,11 @@ in this Software without prior written authorization from The Open Group. #endif #ifdef XF86VIDMODE #include <X11/extensions/xf86vmode.h> -#include <X11/extensions/xf86vmstr.h> +# if HAVE_X11_EXTENSIONS_XF86VMPROTO_H /* xf86vidmodeproto 2.2.99.1 & later */ +# include <X11/extensions/xf86vmproto.h> +# else +# include <X11/extensions/xf86vmstr.h> +# endif #endif #ifdef XFreeXDGA #include <X11/extensions/xf86dga.h> |