xserver: Branch 'master' - 2 commits

[Alan Coopersmith]

 configure.ac             |   20 ++++++++++----------
 hw/xnest/Keyboard.c      |   33 +++++----------------------------
 include/xorg-server.h.in |    8 ++++----
 3 files changed, 19 insertions(+), 42 deletions(-)

New commits:
commit 3208eff2d7b856a4ac0d650498ccb36e7e62e034
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Jan 21 14:45:06 2009 -0800

    Update xorg-server.h.in & Xnest to use new XKB default #defines

diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 16e9fdc..cedaa7a 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -59,29 +59,6 @@ extern	Status	XkbGetControls(
 	unsigned long		/* which */,
 	XkbDescPtr		/* desc */
 );
-
-#ifndef XKB_BASE_DIRECTORY
-#define	XKB_BASE_DIRECTORY	"/usr/X11R6/lib/X11/xkb/"
-#endif
-#ifndef XKB_CONFIG_FILE
-#define	XKB_CONFIG_FILE		"X0-config.keyboard"
-#endif
-#ifndef XKB_DFLT_RULES_FILE
-#define	XKB_DFLT_RULES_FILE	XKB_DFLT_RULES
-#endif
-#ifndef XKB_DFLT_KB_LAYOUT
-#define	XKB_DFLT_KB_LAYOUT	"us"
-#endif
-#ifndef XKB_DFLT_KB_MODEL
-#define	XKB_DFLT_KB_MODEL	"pc101"
-#endif
-#ifndef XKB_DFLT_KB_VARIANT
-#define	XKB_DFLT_KB_VARIANT	NULL
-#endif
-#ifndef XKB_DFLT_KB_OPTIONS
-#define	XKB_DFLT_KB_OPTIONS	NULL
-#endif
-
 #endif
 
 DeviceIntPtr xnestKeyboardDevice = NULL;
@@ -222,11 +199,11 @@ XkbError:
 	XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb);
 
 	memset(&names, 0, sizeof(XkbComponentNamesRec));
-	rules = XKB_DFLT_RULES_FILE;
-	model = XKB_DFLT_KB_MODEL;
-	layout = XKB_DFLT_KB_LAYOUT;
-	variants = XKB_DFLT_KB_VARIANT;
-	options = XKB_DFLT_KB_OPTIONS;
+	rules = XKB_DFLT_RULES;
+	model = XKB_DFLT_MODEL;
+	layout = XKB_DFLT_LAYOUT;
+	variants = XKB_DFLT_VARIANT;
+	options = XKB_DFLT_OPTIONS;
 
 	XkbSetRulesDflts(rules, model, layout, variants, options);
 	XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modmap,
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 4cf1bbf..57b8a82 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -106,7 +106,10 @@
 /* Enable XKB per default */
 #undef XKB_DFLT_DISABLED
 
-/* Build XKB server */
+/* XKB default rules */
+#undef XKB_DFLT_RULES
+
+/* Build XKB support in server */
 #undef XKB_IN_SERVER
 
 /* Support loadable input and output drivers */
@@ -160,9 +163,6 @@
 /* Location of configuration file */
 #undef __XCONFIGFILE__
 
-/* XKB default rules */
-#undef __XKBDEFRULES__
-
 /* Name of X server */
 #undef __XSERVERNAME__
 
commit cdf216aa17b776130a91fa6792c321620e810a18
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Jan 20 16:50:43 2009 -0800

    Fix XKB default configure options to use the right variables

diff --git a/configure.ac b/configure.ac
index e8c5b6a..a9a67d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -487,24 +487,24 @@ AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to
 				[ XKBOUTPUT="compiled" ])
 AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
                                    [Keyboard ruleset (default: base/evdev)]),
-                                [ XKB_RULES="$withval" ],
-                                [ XKB_RULES="" ])
+                                [ XKB_DFLT_RULES="$withval" ],
+                                [ XKB_DFLT_RULES="" ])
 AC_ARG_WITH(default-xkb-model, AS_HELP_STRING([--with-default-xkb-model=MODEL],
                                    [Keyboard model (default: pc104)]),
-                                [ XKB_MODEL="$withval" ],
-                                [ XKB_MODEL="pc104" ])
+                                [ XKB_DFLT_MODEL="$withval" ],
+                                [ XKB_DFLT_MODEL="pc104" ])
 AC_ARG_WITH(default-xkb-layout, AS_HELP_STRING([--with-default-xkb-layout=LAYOUT],
                                    [Keyboard layout (default: us)]),
-                                [ XKB_LAYOUT="$withval" ],
-                                [ XKB_LAYOUT="us" ])
+                                [ XKB_DFLT_LAYOUT="$withval" ],
+                                [ XKB_DFLT_LAYOUT="us" ])
 AC_ARG_WITH(default-xkb-variant, AS_HELP_STRING([--with-default-xkb-variant=VARIANT],
                                    [Keyboard variant (default: (none))]),
-                                [ XKB_VARIANT="$withval" ],
-                                [ XKB_VARIANT="" ])
+                                [ XKB_DFLT_VARIANT="$withval" ],
+                                [ XKB_DFLT_VARIANT="" ])
 AC_ARG_WITH(default-xkb-options, AS_HELP_STRING([--with-default-xkb-options=OPTIONS],
                                    [Keyboard layout options (default: (none))]),
-                                [ XKB_OPTIONS="$withval" ],
-                                [ XKB_OPTIONS="" ])
+                                [ XKB_DFLT_OPTIONS="$withval" ],
+                                [ XKB_DFLT_OPTIONS="" ])
 AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
 				   [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
 				[ SERVERCONFIG="$withval" ],