From a1be3738a98200ab0060808c6f025f798c27c431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Sun, 4 May 2014 15:54:06 +0000 Subject: [PATCH] Make X11 detection more precise Don't be content with just X11/Xlib.h, check for X11/XKBlib.h as well. This prevents false positives (for example, from partial X11 headers installed by tcl/tk). https://bugzilla.gnome.org/show_bug.cgi?id=729513 --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3820c2fcf0..4b9652c172 100644 --- a/configure.ac +++ b/configure.ac @@ -541,7 +541,9 @@ AG_GST_CHECK_FEATURE(X, [X libraries and plugins], CPPFLAGS="$CPPFLAGS $X_CFLAGS" dnl now try to find the HEADER - AC_CHECK_HEADER([X11/Xlib.h], [HAVE_X="yes"], [HAVE_X="no"], [AC_INCLUDES_DEFAULT]) + HAVE_X="yes" + AC_CHECK_HEADER([X11/Xlib.h], [], [HAVE_X="no"], [AC_INCLUDES_DEFAULT]) + AC_CHECK_HEADER([X11/XKBlib.h], [], [HAVE_X="no"], [AC_INCLUDES_DEFAULT]) if test "x$HAVE_X" = "xno" then