Adapt to Xorg; look for XorgVersion as well. Also, undefine XF86DRI for miinitext.o.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@586 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/xc/programs/Xserver/vnc/Xvnc/Imakefile b/xc/programs/Xserver/vnc/Xvnc/Imakefile
index 93885ae321257ca53750f080746474406ff9831f..1223c5765dc6626cf70162cfbdc68fb9ed72be3c 100644 (file)
--- a/xc/programs/Xserver/vnc/Xvnc/Imakefile
+++ b/xc/programs/Xserver/vnc/Xvnc/Imakefile
@@ -60,12 +60,12 @@ DEFINES = $(OS_DEFINES) $(SHMDEF) $(MMAPDEF) $(FB_DEFINES) \
           $(VENDOR_STRING) $(VENDOR_RELEASE) $(STD_DEFINES) ServerOSDefines \
           $(VNCDEFINES) -UXFree86LOADER
 
-#ifdef XFree86Version
+#if defined(XFree86Version) || defined(XorgVersion)
 /* 
  * Make sure XINPUT, XF86VidTune, etc arent defined for the miinitext.o 
  * used by Xvnc 
  */
-EXT_DEFINES = ExtensionDefines -UXF86VIDMODE -UXFreeXDGA -UXF86MISC
+EXT_DEFINES = ExtensionDefines -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI
 #endif