[PATCH 10/37] Move MIT-SCREEN-SAVER from extmod to built-in

[Daniel Stone]

From: Tomas Carnecky <tom at dbservice.com>

If we've built MIT-SCREEN-SAVER support, then just build it into the
main binary, rather than leaving it in extmod.

Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
---
 Xext/Makefile.am                    |    2 +-
 hw/xfree86/dixmods/extmod/modinit.c |    9 ---------
 mi/miinitext.c                      |    6 ++++++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index cb432e0..a443a64 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -58,7 +58,7 @@ endif
 # MIT ScreenSaver extension
 SCREENSAVER_SRCS = saver.c
 if SCREENSAVER
-MODULE_SRCS  += $(SCREENSAVER_SRCS)
+BUILTIN_SRCS  += $(SCREENSAVER_SRCS)
 endif
 
 # Xinerama extension: making multiple video devices act as one virtual screen
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index a415e5f..4441899 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -47,15 +47,6 @@ static ExtensionModule extensionModules[] = {
 	NULL
     },
 #endif
-#ifdef SCREENSAVER
-    {
-	ScreenSaverExtensionInit,
-	ScreenSaverName,
-	&noScreenSaverExtension,
-	NULL,
-	NULL
-    },
-#endif
 #ifdef XF86VIDMODE
     {
 	XFree86VidModeExtensionInit,
diff --git a/mi/miinitext.c b/mi/miinitext.c
index d46b59d..c75c140 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -183,6 +183,9 @@ typedef void (*InitExtension)(void);
 #ifdef RES
 #include <X11/extensions/XResproto.h>
 #endif
+#ifdef SCREENSAVER
+#include <X11/extensions/saver.h>
+#endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
 #ifdef MITSHM
@@ -512,6 +515,9 @@ static ExtensionModule staticExtensions[] = {
 #ifdef DAMAGE
     { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
 #endif
+#ifdef SCREENSAVER
+    { ScreenSaverExtensionInit, ScreenSaverName, &noScreenSaverExtension, NULL },
+#endif
 #ifdef DBE
     { DbeExtensionInit, "DOUBLE-BUFFER", &noDbeExtension, NULL },
 #endif
-- 
1.7.5.4