From 710318e803c6d5c6b8ae170d38c8253f5d780472 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 10 Jul 2012 02:03:27 +0100 Subject: [PATCH] Replace NO_HW_ONLY_EXTS with Xorg DDX test 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 Reviewed-by: Keith Packard Signed-off-by: Keith Packard --- 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 ed46dbbc1..9f4992c8b 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 c395b4dae..3c099cd6b 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 a1438316b..a84d486e1 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