Fix the build on Solaris/sparc to use Xorg server instead of the deprecated

    Xsun (Bug #1134, Alan Coopersmith).

4 files changed, 22 insertions, 6 deletions

diff --git a/X11.tmpl b/X11.tmpl
index 213eaa6..c1212ad 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,6 +1,6 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.26 2004/08/13 22:44:03 alanc Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.27 2004/08/16 16:36:13 krh Exp $
 XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
 XCOMM
 XCOMM
@@ -115,6 +115,12 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
 #ifndef HasXServer
 #define HasXServer		YES
 #endif
+/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf 
+ * from the .cf file for your platform.
+ */
+#ifndef XorgServer
+#define XorgServer		NO  
+#endif
 #ifndef BuildServer
 #define BuildServer		HasXServer
 #endif
diff --git a/sun.cf b/sun.cf
index 876773e..c7aa726 100644
--- a/sun.cf
+++ b/sun.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.7 2004/07/26 16:54:21 alanc Exp $
+XCOMM $XdotOrg: xc/config/cf/sun.cf,v 1.8 2004/08/15 00:58:42 krh Exp $
 XCOMM platform:  $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $
 
 
@@ -420,11 +420,14 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  define Xsun24Server	  NO		/* color, mono, multiple depths */
 # endif
 # ifndef XsunServer
-#  define XsunServer	  YES		/* color and mono, 8 bit only */
+#  define XsunServer	  NO		/* color and mono, 8 bit only */
 # endif
 # ifndef XsunMonoServer
 #  define XsunMonoServer	  NO		/* monochrome only */
 # endif
+# ifndef XorgServer
+#  define XorgServer	(!(Xsun24Server || XsunServer || XsunMonoServer))
+# endif 
 # ifndef BuildPexExt
 #  define BuildPexExt	  (XsunServer || Xsun24Server)
 # endif
diff --git a/svr4.cf b/svr4.cf
index 53480a6..3f0d150 100644
--- a/svr4.cf
+++ b/svr4.cf
@@ -261,7 +261,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $
     defined(PpcArchitecture) || \
     (defined(SparcArchitecture) && \
      defined(SunArchitecture) && \
-     defined(BuildXFree86OnSparcSunOS))
+     (!defined(XorgServer) || (XorgServer)))
 #ifndef DoLoadableServer
 #define DoLoadableServer	YES
 #endif
diff --git a/xorg.cf b/xorg.cf
index 7edf2ce..7de5c66 100644
--- a/xorg.cf
+++ b/xorg.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.21 2004/08/16 22:48:50 kem Exp $
+XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.22 2004/08/18 00:51:32 kem Exp $
 /*
  * This configuration file contains all of the configuration
  * information for the Xorg based X Servers.
@@ -494,10 +494,17 @@ RELEASE_VERSION = ReleaseVersion
 
 /* Pure SBUS and PCI drivers should go first */
 # ifndef XF86CardDrivers
-#  define XF86CardDrivers	sunffb sunleo suncg6 suncg3 suncg14 suntcx \
+#  ifdef SunArchitecture
+#   define XF86CardDrivers	/* sunffb */ sunleo suncg6 suncg3 suncg14 \
+				suntcx sunbw2 glint mga tdfx ati vesa vga \
+				XF86OSCardDrivers XF86ExtraCardDrivers \
+				DevelDrivers
+#  else
+#   define XF86CardDrivers	sunffb sunleo suncg6 suncg3 suncg14 suntcx \
 				sunbw2 glint mga tdfx ati vesa vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers \
 				DevelDrivers
+#  endif
 # endif
 # ifndef DriDrivers
 #  define DriDrivers		ffb