svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .

1 files changed, 14 insertions, 11 deletions

diff --git a/xorg-server/xkbdata.src/configure b/xorg-server/xkbdata.src/configure
index b7d5dcbb1..1fee6dc02 100644
--- a/xorg-server/xkbdata.src/configure
+++ b/xorg-server/xkbdata.src/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xkeyboard-config 1.6.
+# Generated by GNU Autoconf 2.63 for xkeyboard-config 1.6.99.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='1.6'
-PACKAGE_STRING='xkeyboard-config 1.6'
+PACKAGE_VERSION='1.6.99'
+PACKAGE_STRING='xkeyboard-config 1.6.99'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="rules/base.xml.in"
@@ -1342,7 +1342,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 1.6 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 1.6.99 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1409,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xkeyboard-config 1.6:";;
+     short | recursive ) echo "Configuration of xkeyboard-config 1.6.99:";;
    esac
   cat <<\_ACEOF
 
@@ -1506,7 +1506,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 1.6
+xkeyboard-config configure 1.6.99
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1520,7 +1520,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 1.6, which was
+It was created by xkeyboard-config $as_me 1.6.99, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2237,7 +2237,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='1.6'
+ VERSION='1.6.99'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6526,7 +6526,7 @@ ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt
 
 
 
-ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.spec docs/Makefile"
+ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile rules/extras/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile symbols/extras/Makefile types/Makefile xkeyboard-config.spec docs/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7029,7 +7029,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xkeyboard-config $as_me 1.6, which was
+This file was extended by xkeyboard-config $as_me 1.6.99, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7083,7 +7083,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xkeyboard-config config.status 1.6
+xkeyboard-config config.status 1.6.99
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -7212,7 +7212,9 @@ do
     "keymap/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keymap/sun_vndr/Makefile" ;;
     "semantics/Makefile") CONFIG_FILES="$CONFIG_FILES semantics/Makefile" ;;
     "rules/Makefile") CONFIG_FILES="$CONFIG_FILES rules/Makefile" ;;
+    "rules/bin/Makefile") CONFIG_FILES="$CONFIG_FILES rules/bin/Makefile" ;;
     "rules/compat/Makefile") CONFIG_FILES="$CONFIG_FILES rules/compat/Makefile" ;;
+    "rules/extras/Makefile") CONFIG_FILES="$CONFIG_FILES rules/extras/Makefile" ;;
     "symbols/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/Makefile" ;;
     "symbols/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/digital_vndr/Makefile" ;;
     "symbols/fujitsu_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/fujitsu_vndr/Makefile" ;;
@@ -7223,6 +7225,7 @@ do
     "symbols/sony_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sony_vndr/Makefile" ;;
     "symbols/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sun_vndr/Makefile" ;;
     "symbols/xfree68_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/xfree68_vndr/Makefile" ;;
+    "symbols/extras/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/extras/Makefile" ;;
     "types/Makefile") CONFIG_FILES="$CONFIG_FILES types/Makefile" ;;
     "xkeyboard-config.spec") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.spec" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;