andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107521
Fixes: 726839459c (autotools: Derive xkb configuration from xkbcomp.pc)
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: vadym.shovkoplias <vadym.shovkoplias@globallogic.com>
This commit is contained in:
vadym.shovkoplias 2018-08-09 12:25:08 -04:00 committed by Adam Jackson
parent 4fe02b8da3
commit d0545847a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -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])