Commit 99af72fd098b4aeae1121644c7412824583eaaf0

Ran Benita 2014-03-31T18:01:35

configure.ac: fix enable_x11 handling Explicitly passing --enable-x11=yes would actually disable it. Reported-by: Quentin Glidic Signed-off-by: Ran Benita <ran234@gmail.com>

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
diff --git a/configure.ac b/configure.ac
index edee68b..df3962e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,12 +153,12 @@ AS_IF([test "x$DEFAULT_XKB_OPTIONS" != x], [
 AC_ARG_ENABLE([x11],
     [AS_HELP_STRING([--disable-x11],
         [Disable support for creating keymaps with the X11 protocol (default: enabled)])],
-    [enable_x11=no], [enable_x11=yes])
+    [], [enable_x11=yes])
 AS_IF([test "x$enable_x11" = xyes], [
     PKG_CHECK_MODULES([XCB_XKB], [xcb xcb-xkb >= 1.10], [],
         [AC_MSG_ERROR([xkbcommon-x11 requires xcb-xkb >= 1.10 which was not found. \
 You can disable X11 support with --disable-x11.])])
-])
+], [enable_x11=no])
 AM_CONDITIONAL([ENABLE_X11], [test "x$enable_x11" = xyes])
 
 AC_CONFIG_FILES([