[PATCH 2/4] mi: don't call XFree86DRIExtensionInit when not building without XORGSERVER

Peter Hutterer peter.hutterer at who-t.net
Sun Jun 17 20:40:17 PDT 2012


XF86DRI define may be defined if we're building DDX other than Xorg, so we
need to special-case it here. XFreeXDGA and XFree86VidModeExtensionInit
depend on Xorg in configure.ac, the others are non-ddx specific.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 mi/miinitext.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 6ceae05..42983db 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -459,10 +459,12 @@ InitExtensions(int argc, char *argv[])
         XFree86DGAExtensionInit();
 #endif
 #ifdef XF86DRI
+#ifdef XORGSERVER /* XF86DRI may be defined when building without Xorg */
     if (!noXFree86DRIExtension)
         XFree86DRIExtensionInit();
 #endif
 #endif
+#endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
     if (!noXFixesExtension)
-- 
1.7.10.2



More information about the xorg-devel mailing list