Commit ba21fc29 authored by Tomas Carnecky's avatar Tomas Carnecky Committed by Keith Packard

Move DPMS from extmod to built-in

Always build DPMS support into the core server, rather than letting it
languish in extmod.
Signed-off-by: default avatarTomas Carnecky <tom@dbservice.com>
Reviewed-by: default avatarDaniel Stone <daniel@fooishbar.org>
Reviewed-by: default avatarJamey Sharp <jamey@minilop.net>
Signed-off-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 3ed2c6e1
......@@ -103,7 +103,7 @@ endif
# DPMS extension
DPMS_SRCS = dpms.c dpmsproc.h
if DPMSExtension
MODULE_SRCS += $(DPMS_SRCS)
BUILTIN_SRCS += $(DPMS_SRCS)
endif
# Now take all of the above, mix well, bake for 10 minutes and get libXext*.la
......
......@@ -63,14 +63,6 @@ static ExtensionModule extensionModules[] = {
XFree86DGARegister,
NULL},
#endif
#ifdef DPMSExtension
{
DPMSExtensionInit,
DPMSExtensionName,
&noDPMSExtension,
NULL,
NULL},
#endif
#ifdef XV
{
XvExtensionInit,
......
......@@ -72,7 +72,7 @@ extern void DbeExtensionInit(void);
extern void DMXExtensionInit(void);
#endif
#if defined(DPMSExtension) && !defined(XorgLoader)
#if defined(DPMSExtension)
#include <X11/extensions/dpmsconst.h>
extern Bool noDPMSExtension;
extern void DPMSExtensionInit(void);
......
......@@ -406,6 +406,9 @@ static ExtensionModule staticExtensions[] = {
#ifdef XRECORD
{RecordExtensionInit, "RECORD", &noTestExtensions, NULL},
#endif
#ifdef DPMSExtension
{DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL},
#endif
};
/*ARGSUSED*/ void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment