summaryrefslogtreecommitdiff
path: root/X11.tmpl
diff options
context:
space:
mode:
authorDeron Johnson <deron.johnson@sun.com>2005-01-06 19:56:44 +0000
committerDeron Johnson <deron.johnson@sun.com>2005-01-06 19:56:44 +0000
commit5bef8c1455cd3de10b483e748eb3e0bfb7770505 (patch)
tree1f50437ba8067c8f2922b3054c7b19284b149cea /X11.tmpl
parent435c4808e0d4906dc5cda9672139a64694681bce (diff)
Integrate 6.8.2 RC2 changes.lg3d-dev-0-6-1
Diffstat (limited to 'X11.tmpl')
-rw-r--r--X11.tmpl17
1 files changed, 15 insertions, 2 deletions
diff --git a/X11.tmpl b/X11.tmpl
index cef5a40..db6c01d 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1,6 +1,6 @@
XCOMM ----------------------------------------------------------------------
XCOMM X Window System Build Parameters and Rules
-XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.35 2004/09/03 16:18:18 kem Exp $
+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.35.4.1 2004/09/16 23:37:20 deronj Exp $
XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
XCOMM
XCOMM
@@ -687,6 +687,10 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
#define BuildLg3dLibrary !BuildServersOnly
#endif
+#ifndef BuildRootless
+#define BuildRootless NO
+#endif
+
#ifndef BuildXterm
#define BuildXterm BuildClients
#endif
@@ -1252,6 +1256,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
+#ifndef RootlessDefines
+#if BuildRootless
+#define RootlessDefines -DROOTLESS
+#else
+#define RootlessDefines /**/
+#endif
+#endif
+
#ifndef SitePervasiveExtensionDefines
#define SitePervasiveExtensionDefines /**/
#endif
@@ -1262,7 +1274,8 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
XF86BigfontExtensionDefines DPMSDefines \
LowMemDefines XprintDefines XineramaDefines \
SitePervasiveExtensionDefines RenderDefines RandRDefines \
- XfixesDefines XDamageDefines CompositeDefines XevieDefines Lg3dDefines
+ XfixesDefines XDamageDefines CompositeDefines XevieDefines RootlessDefines \
+ Lg3dDefines
#endif
#ifndef SiteExtensionDefines
#define SiteExtensionDefines /**/