config/cf/DGUX.cf, config/cf/QNX4.cf, config/cf/bsdi.cf, config/cf/isc.cf,

    config/cf/lynx.cf, config/cf/mach.cf, config/cf/nto.cf,
    config/cf/sco5.cf, config/cf/sgi.cf, config/cf/sun.cf,
    config/cf/x386.cf Enable compilation of old keyboard driver for these
    platforms by default (#1070).

11 files changed, 46 insertions, 2 deletions

diff --git a/DGUX.cf b/DGUX.cf
index 1507a01..722fe7b 100644
--- a/DGUX.cf
+++ b/DGUX.cf
@@ -179,6 +179,10 @@ XCOMM platform:  $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Ex
 #endif
 #endif
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #ifdef i386Architecture
 #include <xorg.cf>
 #endif
diff --git a/QNX4.cf b/QNX4.cf
index daf3dad..b38738c 100644
--- a/QNX4.cf
+++ b/QNX4.cf
@@ -36,6 +36,10 @@ XCOMM platform:  $XFree86: xc/config/cf/QNX4.cf,v 1.3 2000/07/07 20:06:56 tsi Ex
 #define InstallCmd		$(SHELL) $(CONFIGSRC)/util/install.sh
 #endif
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #define DefaultCCOptions	-5s -Otx -Wc,-r -b -j -Wc,-ei -N128000 -zp4 -mf
 #define LibraryCCOptions	-5s -Otx -Wc,-r -b -j -Wc,-ei -zp4 -mf
 #define ServerCCOptions		-5s -Otx -Wc,-r -T1 -M -N4096000 -j -b -mf -Wc,-ei -Wc,-s -zp4 -llibmalloc
diff --git a/bsdi.cf b/bsdi.cf
index fe0b95d..3d0be43 100644
--- a/bsdi.cf
+++ b/bsdi.cf
@@ -56,6 +56,10 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define GzipFontCompression	YES
 #define BuildXaw6		NO
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 XCOMM BSD/OS 5.1 (intel) comes with gcc 3.2.2 installed as gcc and cc.
 
 XCOMM BSD/OS 5.0 (intel) comes with gcc 2.95.3 installed as gcc and cc.
diff --git a/isc.cf b/isc.cf
index 11bf737..b4078e4 100644
--- a/isc.cf
+++ b/isc.cf
@@ -42,6 +42,10 @@ XCOMM platform:  $XFree86: xc/config/cf/isc.cf,v 3.15 1999/07/10 12:17:09 dawes
 #  define BuildXF86DRI   NO
 #endif
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 /*
  * disable building DRI support into video drivers, which can be done
  * even on platforms that don't have functional DRI support.
diff --git a/lynx.cf b/lynx.cf
index 22a926d..a00fe78 100644
--- a/lynx.cf
+++ b/lynx.cf
@@ -399,4 +399,8 @@ install.man:: list                                                      @@\
 #include <lynxLib.rules>
 #endif
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #include <xorg.cf>
diff --git a/mach.cf b/mach.cf
index c2047a3..1347e7d 100644
--- a/mach.cf
+++ b/mach.cf
@@ -67,6 +67,10 @@ XCOMM operating system:  OSName
 # define ExtraFilesToClean *.core
 #endif
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #ifdef i386Architecture
 # include <xorg.cf>
 #endif
diff --git a/nto.cf b/nto.cf
index edf2d77..e3b94fe 100644
--- a/nto.cf
+++ b/nto.cf
@@ -57,6 +57,10 @@
 #define StandardCppDefines	-traditional StandardDefines
 #define PreProcessCmd		CppCmd
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #define HasShm			NO    /* For now as well */
 #define HasSockets		YES
 #define HasPutenv		YES
diff --git a/sco5.cf b/sco5.cf
index 7b9783d..2ed291e 100644
--- a/sco5.cf
+++ b/sco5.cf
@@ -1,5 +1,5 @@
 XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
-XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.1.4.3.2.1.6.3 2004/04/13 23:32:20 gisburn Exp $
+XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.2 2004/04/23 18:41:58 eich Exp $
 
 /*
  * This is for SCO Open Server 5.0.6A or later. You must have the
@@ -82,6 +82,10 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.1.4.3.2.1.6.3 2004/04/13 23:32:20 gisbu
 #define	HasNCurses		YES
 #define NCursesLibName		-lcurses
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #define LogDirectory		/var/adm
 
 #ifndef PexDynamicModule
diff --git a/sgi.cf b/sgi.cf
index 5e4aa8a..0081d09 100644
--- a/sgi.cf
+++ b/sgi.cf
@@ -316,4 +316,8 @@ clean::									@@\
 #define DoLoadableServer YES
 #endif
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #include <xorg.cf>
diff --git a/sun.cf b/sun.cf
index d8cced4..876773e 100644
--- a/sun.cf
+++ b/sun.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.6 2004/07/13 08:55:20 gisburn Exp $
+XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.7 2004/07/26 16:54:21 alanc Exp $
 XCOMM platform:  $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
 
 
@@ -458,6 +458,10 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #define HasUsableFileMap YES
 #endif
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 #if HasGcc
 # if OSMajorVersion > 4
 #  ifndef DefaultCCOptions
diff --git a/x386.cf b/x386.cf
index c3fbd38..d7d4c80 100644
--- a/x386.cf
+++ b/x386.cf
@@ -32,6 +32,10 @@ XCOMM platform:  $Xorg: x386.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
 #define NeedBerklib		YES
 #define HasSymLinks		NO
 
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver YES
+#endif
+
 /*
  * V/386 Release 3.2
  */