diff options
author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/include/dix-config.h.in | |
parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
download | vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2 vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/dix-config.h.in')
-rw-r--r-- | xorg-server/include/dix-config.h.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in index db491ed06..fcb582ff0 100644 --- a/xorg-server/include/dix-config.h.in +++ b/xorg-server/include/dix-config.h.in @@ -124,6 +124,9 @@ /* Have Quartz */ #undef XQUARTZ +/* Support application updating through sparkle. */ +#undef XQUARTZ_SPARKLE + /* Build a standalone xpbproxy */ #undef STANDALONE_XPBPROXY @@ -315,15 +318,6 @@ /* Support Xinerama extension */ #undef XINERAMA -/* Build XKB */ -#undef XKB - -/* Enable XKB per default */ -#undef XKB_DFLT_DISABLED - -/* Build XKB server */ -#undef XKB_IN_SERVER - /* Vendor release */ #undef XORG_RELEASE |