From 3e08cc27d043701692289d8524ac99062b929550 Mon Sep 17 00:00:00 2001 From: "vadym.shovkoplias" Date: Thu, 9 Aug 2018 18:59:03 +0300 Subject: [PATCH xserver] autotools: Handle case when bindir var in xkbcomp.pc is absent Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107521 Fixes: 726839459cb (autotools: Derive xkb configuration from xkbcomp.pc) Signed-off-by: vadym.shovkoplias --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index defb707a2..651ad4af7 100644 --- a/configure.ac +++ b/configure.ac @@ -1402,7 +1402,10 @@ AC_ARG_WITH(xkb-bin-directory, [XKB_BIN_DIRECTORY="auto"]) if test "x$XKB_BIN_DIRECTORY" = "xauto"; then - XKB_BIN_DIRECTORY=$(pkg-config --variable bindir xkbcomp || echo ${bindir}) + XKB_BIN_DIRECTORY=$(pkg-config --variable bindir xkbcomp) + if test -z $XKB_BIN_DIRECTORY; then + XKB_BIN_DIRECTORY="$bindir" + fi fi AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir]) -- 2.18.0