xserver: Branch 'master'

[GitLab Mirror]

 configure.ac |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d0545847a06f375586927ea66c521a039439f708
Author: vadym.shovkoplias <vadym.shovkoplias at globallogic.com>
Date:   Thu Aug 9 12:25:08 2018 -0400

    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)
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: vadym.shovkoplias <vadym.shovkoplias at globallogic.com>

diff --git a/configure.ac b/configure.ac
index 350c89a3b..f547b1dc9 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])