Commit d0545847 authored by vadym.shovkoplias's avatar vadym.shovkoplias Committed by Adam Jackson

autotools: Handle case when bindir var in xkbcomp.pc is absent

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107521
Fixes: 72683945 (autotools: Derive xkb configuration from xkbcomp.pc)
Reviewed-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarvadym.shovkoplias <vadym.shovkoplias@globallogic.com>
parent 4fe02b8d
......@@ -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])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment