[PATCH xserver] autotools: Handle case when bindir var in xkbcomp.pc is absent

[Adam Jackson]

From: "vadym.shovkoplias" <vadym.shovkoplias at globallogic.com>

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107521
Fixes: 726839459cb (autotools: Derive xkb configuration from xkbcomp.pc)

Signed-off-by: vadym.shovkoplias <vadym.shovkoplias at globallogic.com>
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 350c89a3bf..f547b1dc9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1404,7 +1404,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.17.0