forked from brl/citadel
23 lines
905 B
Diff
23 lines
905 B
Diff
|
Upstream-Status: Pending
|
||
|
|
|
||
|
|
Index: xdpyinfo-1.3.0/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- xdpyinfo-1.3.0.orig/configure.ac 2011-10-21 21:34:21.000000000 -0700
|
||
|
|
+++ xdpyinfo-1.3.0/configure.ac 2011-11-28 20:06:56.554056935 -0800
|
||
|
|
@@ -47,11 +47,15 @@
|
||
|
|
AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>])
|
||
|
|
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
|
||
|
|
|
||
|
|
+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
|
||
|
|
+ XKB="$enableval", XKB="yes")
|
||
|
|
+if test "x$XKB" = "xyes" ; then
|
||
|
|
PKG_CHECK_MODULES(DPY_XKB, x11,
|
||
|
|
[SAVE_CPPFLAGS="$CPPFLAGS"
|
||
|
|
CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
|
||
|
|
AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
|
||
|
|
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
|
||
|
|
+fi
|
||
|
|
|
||
|
|
PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm,
|
||
|
|
[SAVE_CPPFLAGS="$CPPFLAGS"
|