diff options
| author | svu <svu> | 2007-03-29 22:20:24 +0000 |
|---|---|---|
| committer | svu <svu> | 2007-03-29 22:20:24 +0000 |
| commit | b8eb40da2c79da0bafe64df07e112d58b6dcdde5 (patch) | |
| tree | 6bde38d4a0efb228e8556dceb4ebb477bbdc5fff | |
| parent | f388f19975bddf76fdbe982432b9d1303d4524d8 (diff) | |
improved xkb_base calculation, b.fd.o#10435
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 20 |
2 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2007-03-29 Sergey Udaltsov + + * configure.in: improved xkb_base calculation, closing + https://bugs.freedesktop.org/show_bug.cgi?id=10435 + 2007-03-13 Sergey Udaltsov * configure.in: added Korean translation, diff --git a/configure.in b/configure.in index 1473895b..191b1f03 100644 --- a/configure.in +++ b/configure.in @@ -11,9 +11,9 @@ if test x$XKBCOMP = xnot_found ; then fi AC_ARG_WITH( xkb_base, - [ --with-xkb-base=DIR XKB base path (by default it is /usr/X11R6/lib/X11/xkb)], + [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])], xkb_base="$withval", - xkb_base="\$(prefix)/lib/X11/xkb" ) + xkb_base="\$(datadir)/X11/xkb" ) AC_ARG_WITH( xkb_rules_symlink, [ --with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)], @@ -73,3 +73,19 @@ xkeyboard-config.spec docs/Makefile ]) +echo '***********************************************************' +echo " $PACKAGE_NAME is configured with the following parameters:" +echo " XKB base directory: $xkb_base" +if test -z "$xkb_rules_symlink" ; then + echo " Symbolic link(s) to legacy rules are not created" +else + echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink" +fi + +if test "$enable_compat_rules" == "yes" ; then + echo " Compatibility rules are included" +else + echo " Compatibility rules are not included" +fi +echo '***********************************************************' + |