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

[Adam Jackson]

On Thu, 2018-08-09 at 12:25 -0400, Adam Jackson wrote:
> From: "vadym.shovkoplias" 

Apologies to Vadym, who had tried to send the same thing to the list
but got blocked by moderation.

> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107521
> Fixes: 726839459cb (autotools: Derive xkb configuration from xkbcomp.pc)
> 
> Signed-off-by: vadym.shovkoplias 

Merged, thanks:

remote: remote: I: patch #243732 updated using rev 
d0545847a06f375586927ea66c521a039439f708.
remote: remote: I: 1 patch(es) updated to state Accepted.
remote: To ssh://kemper.freedesktop.org/git/xorg/xserver
remote:4fe02b8da..d0545847a  d0545847a06f375586927ea66c521a039439f708 -> 
master
To ssh://gitlab.freedesktop.org/xorg/xserver
   4fe02b8da3..d0545847a0  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

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

[Adam Jackson]

From: "vadym.shovkoplias" 

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

Signed-off-by: vadym.shovkoplias 
---
 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

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel