From: Tomas Carnecky <[email protected]> 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 <[email protected]> Reviewed-by: Daniel Stone <[email protected]> Reviewed-by: Jamey Sharp <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> --- Xext/Makefile.am | 2 +- hw/xfree86/dixmods/extmod/modinit.c | 8 -------- include/extinit.h | 2 +- mi/miinitext.c | 3 +++ 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 4082de7..4f91254 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 009852c..660b1cd 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -47,14 +47,6 @@ static ExtensionModule extensionModules[] = { NULL, NULL}, #endif -#ifdef SCREENSAVER - { - ScreenSaverExtensionInit, - ScreenSaverName, - &noScreenSaverExtension, - NULL, - NULL}, -#endif #ifdef XF86VIDMODE { XFree86VidModeExtensionInit, diff --git a/include/extinit.h b/include/extinit.h index 2755e30..61768b0 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -110,7 +110,7 @@ extern Bool noResExtension; extern void ResExtensionInit(void); #endif -#if defined(SCREENSAVER) && !defined(XorgLoader) +#if defined(SCREENSAVER) #include <X11/extensions/saver.h> extern Bool noScreenSaverExtension; extern void ScreenSaverExtensionInit(void); diff --git a/mi/miinitext.c b/mi/miinitext.c index 0d87294..abd9e94 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -397,6 +397,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.10.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
