xkeyboard-config ChangeLog,1.270,1.271 configure.in,1.53,1.54

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config
In directory kemper:/tmp/cvs-serv9214

Modified Files:
	ChangeLog configure.in 
Log Message:
improved xkb_base calculation, b.fd.o#10435

Index: ChangeLog
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- ChangeLog	13 Mar 2007 00:06:41 -0000	1.270
+++ ChangeLog	29 Mar 2007 22:20:24 -0000	1.271
@@ -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,

Index: configure.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- configure.in	12 Mar 2007 23:58:58 -0000	1.53
+++ configure.in	29 Mar 2007 22:20:24 -0000	1.54
@@ -11,9 +11,9 @@
 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 @@
 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 '***********************************************************'
+