[PATCH 43/54] Replace NO_HW_ONLY_EXTS with Xorg DDX test
Daniel Stone
daniel at fooishbar.org
Mon Jul 9 18:03:27 PDT 2012
Turns out the only thing we use NO_HW_ONLY_EXTS for is to check whether
or not we're building inside the Xorg DDX. Replace it with an
XorgLoader test instead, and remove all its users.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
hw/vfb/Makefile.am | 2 --
hw/xnest/Makefile.am | 1 -
mi/miinitext.c | 2 +-
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index ed46dbb..9f4992c 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -4,8 +4,6 @@ bin_PROGRAMS = Xvfb
noinst_LIBRARIES = libfbcmap.a
AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
- -DNO_HW_ONLY_EXTS \
- -DNO_MODULE_EXTS \
$(XVFBMODULES_CFLAGS) \
$(DIX_CFLAGS)
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index c395b4d..3c099cd 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -4,7 +4,6 @@ bin_PROGRAMS = Xnest
noinst_LIBRARIES = libfbcmap.a
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
- -DNO_HW_ONLY_EXTS \
$(DIX_CFLAGS) \
$(XNESTMODULES_CFLAGS)
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 62cf881..77efe9f 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -157,7 +157,7 @@ static ExtensionToggle ExtensionToggleList[] = {
#ifdef XF86BIGFONT
{"XFree86-Bigfont", &noXFree86BigfontExtension},
#endif
-#ifndef NO_HW_ONLY_EXTS
+#ifdef XorgLoader
#ifdef XFreeXDGA
{"XFree86-DGA", &noXFree86DGAExtension},
#endif
--
1.7.10.4
More information about the xorg-devel
mailing list