* config.make.in (datarootdir,LEX,YACC): New variable.
* configure.ac (XKB_BASE): Drop extraneous "/share" from path.
* configure.ac: Reset pkg-config status between tests.
---
Hi,
Here's a slight addition: The pkg-config error state was not being
reset between the variable reads. This would force a blank X11_PREFIX
if xkeyboard-config is not detected.
Also, since LEX was in the same boat as YACC, that definition is included.
Thanks.
David
config.make.in | 3 +++
configure.ac | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/config.make.in b/config.make.in
index b8002a1..dbcf8a3 100644
--- a/config.make.in
+++ b/config.make.in
@@ -30,6 +30,7 @@ sysconfdir = @sysconfdir@
localstatedir = @localstatedir@
sharedstatedir = @sharedstatedir@
datadir = @datadir@
+datarootdir = @datarootdir@
# All of those directories together:
installationdirlist = $(hurddir) $(libdir) $(bindir) $(sbindir) \
@@ -48,6 +49,8 @@ MIG = @MIG@
MIGCOM = $(MIG) -cc cat - /dev/null
AWK = @AWK@
SED = @SED@
+LEX = @LEX@
+YACC = @YACC@
# Compilation flags. Append these to the definitions already made by
# the specific Makefile.
diff --git a/configure.ac b/configure.ac
index 31e48ef..b827536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,8 +246,9 @@ PKG_CHECK_MODULES([X11], [x11 xproto],
AS_IF([test $pkg_failed = no],
[XKB_BASE="$pkg_cv_XKB_BASE"
AC_MSG_RESULT([$XKB_BASE])],
- [XKB_BASE="$datadir/share/X11/xkb"
+ [XKB_BASE="$datadir/X11/xkb"
AC_MSG_RESULT([(default) $XKB_BASE])])
+ pkg_failed=no
AC_MSG_CHECKING([for X11 prefix])
_PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11])
AS_IF([test $pkg_failed = no],
--
1.8.3.1
