diff options
| author | Peter Åstrand <astrand@cendio.se> | 2006-05-24 11:05:26 +0000 |
|---|---|---|
| committer | Peter Åstrand <astrand@cendio.se> | 2006-05-24 11:05:26 +0000 |
| commit | b7ad8b614f7288686df33f8fbc555b713c9fdec4 (patch) | |
| tree | 31590c9cdae2e61a8269d208bba251ad2bbb0206 /xc | |
| parent | 601eb615f7a1155bdf0518bd75872e9331b836fa (diff) | |
| download | tigervnc-b7ad8b614f7288686df33f8fbc555b713c9fdec4.tar.gz tigervnc-b7ad8b614f7288686df33f8fbc555b713c9fdec4.zip | |
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
Diffstat (limited to 'xc')
| -rw-r--r-- | xc/programs/Xserver/vnc/Xvnc/Imakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xc/programs/Xserver/vnc/Xvnc/Imakefile b/xc/programs/Xserver/vnc/Xvnc/Imakefile index 93885ae3..1223c576 100644 --- 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 |