diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-08-03 07:28:55 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-08-03 07:28:55 +0000 |
| commit | 7e0ae9f4e113bc38c38a2d38c6f8c12eae24376b (patch) | |
| tree | b61feb66bd4d659ae3a578fc8cad781a355ea370 | |
| parent | c2ac021e3ddb8c720b7d73df42ffeed3cfd3df12 (diff) | |
Fix build with BuildComposite by linking the composite library into the
servers before damage/xfixes, and enable BuildComposite by default now.
Note that the Composite extension is still disabled at run-time by
default.
| -rw-r--r-- | X11.tmpl | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.20 2004/07/31 01:38:58 stukreit Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.21 2004/07/31 05:50:38 anholt Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -658,8 +658,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ #endif #ifndef BuildComposite -XCOMM Composite is disabled until it gets all merged. -#define BuildComposite (NO && BuildXfixes && BuildDamage) +#define BuildComposite (BuildXfixes && BuildDamage) #endif #ifndef BuildCompositeLibrary #define BuildCompositeLibrary !BuildServersOnly && (BuildXfixesLibrary && \ |