diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-08-13 22:44:03 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-08-13 22:44:03 +0000 |
| commit | 8c05d76f7f58a41d308af41150530d54b2942c03 (patch) | |
| tree | d3e6946224fc5f699d5e525821b87436bb73ee4a | |
| parent | 4ddde89177109174f7890e0c48445362ae2a74eb (diff) | |
Bugzilla #1055: "#define BuildXprint NO" is broken (6.7.99.2) If XprtServer
is undefined, but BuildXprint is defined, then BuildXprint should set
XprtServer as well.
Remove extra setting of XprtServer - just let it use the setting in
X11.tmpl
| -rw-r--r-- | X11.tmpl | 8 | ||||
| -rw-r--r-- | xorg.cf | 5 |
2 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.24 2004/08/11 23:01:30 kem Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.25 2004/08/12 13:08:25 krh Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -473,7 +473,11 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ #define BuildPlugin HasPlugin #endif #ifndef XprtServer -#define XprtServer BuildServer +# ifdef BuildXprint +# define XprtServer (BuildServer && BuildXprint) +# else +# define XprtServer BuildServer +# endif #endif #ifndef XpRasterDDX #define XpRasterDDX YES @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.18 2004/08/12 05:11:57 kem Exp $ +XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.19 2004/08/12 14:35:55 krh Exp $ /* * This configuration file contains all of the configuration * information for the Xorg based X Servers. @@ -1410,9 +1410,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef XVirtualFramebufferServer # define XVirtualFramebufferServer YES #endif -#ifndef XprtServer -# define XprtServer YES -#endif #ifndef ServerExtraDefines # define ServerExtraDefines XFree86ServerDefines |