Index: xc/config/cf/xprint_site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Attic/xprint_site.def,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 xprint_site.def
--- a/xc/config/cf/xprint_site.def	16 Apr 2004 22:16:01 -0000	1.1.2.6
+++ b/xc/config/cf/xprint_site.def	17 Apr 2004 02:31:01 -0000
@@ -133,8 +133,6 @@
 #define BuildXcursorLibrary            NO
 #define BuildXcursorgen                NO
 #define SharedLibFontEnc               NO
-/* CAUTION: The XF86 "smart" scheduler breaks Xprt */
-#define UseSmartScheduler              NO
 
 /* Build only Xprint applications */
 #ifndef BuildXprintAppsOnly
Index: xc/programs/Xserver/dix/dispatch.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/dispatch.c,v
retrieving revision 1.1.4.4.2.3
diff -u -r1.1.4.4.2.3 dispatch.c
--- a/xc/programs/Xserver/dix/dispatch.c	8 Mar 2004 00:36:56 -0000	1.1.4.4.2.3
+++ b/xc/programs/Xserver/dix/dispatch.c	17 Apr 2004 02:31:12 -0000
@@ -253,7 +253,14 @@
 #define SMART_SCHEDULE_DEFAULT_INTERVAL	20	    /* ms */
 #define SMART_SCHEDULE_MAX_SLICE	200	    /* ms */
 
-Bool	    SmartScheduleDisable;
+#ifdef XPRINT
+/* Somehow the XF86 "smart scheduler" completely kills the Xprint DDX 
+ * (see http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=467
+ * ("Xfree86's "smart scheduler" breaks Xprt") */
+Bool	    SmartScheduleDisable = TRUE;
+#else
+Bool	    SmartScheduleDisable = FALSE;
+#endif /* XPRINT */
 long	    SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;
 long	    SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
 long	    SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;