diff options
| author | vadym.shovkoplias <vadym.shovkoplias@globallogic.com> | 2018-08-09 12:25:08 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-08-09 12:26:26 -0400 |
| commit | d0545847a06f375586927ea66c521a039439f708 (patch) | |
| tree | d15c915ab9a174024b56a3907ee6009c783809b7 | |
| parent | 4fe02b8da3ca58500f7e6e017e388907cf4a8b73 (diff) | |
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@redhat.com>
Signed-off-by: vadym.shovkoplias <vadym.shovkoplias@globallogic.com>
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
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]) |