- merge from XFree86-4_2_0 branch.

[packages/XFree86.git] / XFree86-PEX+XIE.patch

--- XFree86-4.2.0/xc/config/cf/xfree86.cf.orig	Sat Feb  2 22:43:40 2002
+++ XFree86-4.2.0/xc/config/cf/xfree86.cf	Sun Feb  3 01:19:18 2002
@@ -815,7 +815,7 @@
  */
 #if !defined(BuildPexExt)
 # if XF86Server && !defined(AlphaArchitecture) && !defined(ia64Architecture) && !defined(s390xArchitecture)
-#  define BuildPexExt		NO	/* But we turn off PEX anyway now */
+#  define BuildPexExt		YES	/* But we turn off PEX anyway now */
 # else
 #  define BuildPexExt		NO
 # endif
@@ -1021,7 +1021,7 @@
  */
 #ifndef BuildXIE
 # if XF86Server
-#  define BuildXIE		NO
+#  define BuildXIE		YES
 # else
 #  define BuildXIE		NO
 # endif
--- XFree86-4.2.0/xc/programs/xdpyinfo/Imakefile.orig	Thu Dec 27 21:02:34 2001
+++ XFree86-4.2.0/xc/programs/xdpyinfo/Imakefile	Sun Feb  3 10:56:30 2002
@@ -10,11 +10,6 @@
         SHMDEFINES = -DMITSHM
 #endif
 
-#if BuildXIElib
-        XIEDEFINES = -DXIE
-        XIEDEPLIBS = $(DEPXIELIB)
-           XIELIBS = $(XIELIB)
-#endif
 
 #if BuildXF86VidModeLibrary
     VIDMODEDEFINES = -DXF86VIDMODE