diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:10 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:10 +0000 |
| commit | b396481e36a0395b189ba3c6e3fab7737e893e13 (patch) | |
| tree | 384174ffab8c26add04e5392aa373b7aa528b466 | |
| parent | 83994d42b8a5722e701aab39092bda64b9a79cb8 (diff) | |
70. Merging in the TM branch (Egbert Eich).XORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGE
| -rw-r--r-- | Amoeba.cf | 2 | ||||
| -rw-r--r-- | DGUX.cf | 2 | ||||
| -rw-r--r-- | FreeBSD.cf | 2 | ||||
| -rw-r--r-- | Imake.rules | 11 | ||||
| -rw-r--r-- | Imake.tmpl | 22 | ||||
| -rw-r--r-- | NetBSD.cf | 4 | ||||
| -rw-r--r-- | OpenBSD.cf | 46 | ||||
| -rw-r--r-- | QNX4.cf | 2 | ||||
| -rw-r--r-- | Server.tmpl | 4 | ||||
| -rw-r--r-- | X11.tmpl | 75 | ||||
| -rw-r--r-- | bsdi.cf | 2 | ||||
| -rw-r--r-- | cygwin.cf | 7 | ||||
| -rw-r--r-- | darwin.cf | 2 | ||||
| -rw-r--r-- | gnu.cf | 2 | ||||
| -rw-r--r-- | linux.cf | 2 | ||||
| -rw-r--r-- | lynx.cf | 2 | ||||
| -rw-r--r-- | mach.cf | 2 | ||||
| -rw-r--r-- | minix.cf | 2 | ||||
| -rw-r--r-- | nto.cf | 2 | ||||
| -rw-r--r-- | os2.cf | 2 | ||||
| -rw-r--r-- | sco.cf | 2 | ||||
| -rw-r--r-- | sco5.cf | 2 | ||||
| -rw-r--r-- | sequent.cf | 4 | ||||
| -rw-r--r-- | sgi.cf | 2 | ||||
| -rw-r--r-- | site.def | 6 | ||||
| -rw-r--r-- | site.sample | 4 | ||||
| -rw-r--r-- | svr3.cf | 2 | ||||
| -rw-r--r-- | svr4.cf | 2 | ||||
| -rw-r--r-- | xf86.tmpl | 2 | ||||
| -rw-r--r-- | xorg.cf | 2027 | ||||
| -rw-r--r-- | xorg.tmpl | 151 | ||||
| -rw-r--r-- | xorgsite.def | 697 |
32 files changed, 3029 insertions, 67 deletions
@@ -186,7 +186,7 @@ ARCH = i80386 TOOLSET = ack ALDFLAGS = /* -mam_i80386 now in CCopts */ -.c -Rcv-s32 -#include <xfree86.cf> +#include <xorg.cf> #endif #if defined(Sun3Architecture) @@ -180,7 +180,7 @@ XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Ex #endif #ifdef i386Architecture -#include <xfree86.cf> +#include <xorg.cf> #endif #include <sv4Lib.rules> @@ -564,4 +564,4 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #include <bsdLib.rules> -#include <xfree86.cf> +#include <xorg.cf> diff --git a/Imake.rules b/Imake.rules index e39dd4d..fed1e68 100644 --- a/Imake.rules +++ b/Imake.rules @@ -1,7 +1,7 @@ XCOMM --------------------------------------------------------------------- XCOMM Imake rules for building libraries, programs, scripts, and data files XCOMM rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM rules: $XdotOrg$ +XCOMM rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.1.4.3.6.2.2.1 2004/03/23 12:46:30 eich Exp $ XCOMM XCOMM XCOMM @@ -557,6 +557,13 @@ install:: @@\ MakeDir(dir) #endif /* InstallDirectory */ +#ifndef InstallCreateLink +# define InstallCreateLink(dest,from,to) @@\ +install:: $(DESTDIR)dest/from @@\ + cd $(DESTDIR)dest && \ @@\ + $(LN) -sf from to +#endif + #ifndef BuildIncludesTop #define BuildIncludesTop(srclist) @@\ includes:: srclist @@\ @@ -1487,6 +1494,7 @@ clean:: @@\ #if BuildHtmlManPages #define InstallHtmlManPageAliases(file,aliases,suffix) @@\ install.man:: file.suffix.html @@\ + MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ @SUF=`expr suffix \: '\(.\)'`; \ @@\ for i in aliases; do (set -x; \ @@\ RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \ @@\ @@ -1502,6 +1510,7 @@ install.man:: file.suffix.html @@\ #if BuildHtmlManPages #define HtmlManIndex @@\ html_index:: @@\ + MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ $(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR) #else #define HtmlManIndex html_index:: @@ -1,7 +1,7 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.1.4.5 2003/12/15 16:42:40 kaleb Exp $ +XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.1.4.6.2.1.4.1 2004/03/19 17:08:59 eich Exp $ XCOMM XCOMM XCOMM @@ -894,6 +894,9 @@ TCLIBDIR = TclLibDir #ifndef AppLoadDefs #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) #endif +#ifndef AppManDefs +#define AppManDefs -D__appmansuffix__=$(MANSUFFIX) +#endif #ifndef LibManDefs #define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX) #endif @@ -912,6 +915,18 @@ TCLIBDIR = TclLibDir #ifndef ProjectManDefs #define ProjectManDefs -D__projectroot__=$(PROJECTROOT) #endif +#ifndef XConfigFileManDefs +#define XConfigFileManDefs -D__xconfigfile__=$(XCONFIGFILE) +#endif +#ifndef XConfigDirManDefs +#define XConfigDirManDefs -D__xconfigdir__=$(XCONFIGDIR) +#endif +#ifndef XLogFileManDefs +#define XLogFileManDefs -D__xlogfile__=$(XLOGFILE) +#endif +#ifndef XServerManDefs +#define XServerManDefs -D__xservername__=$(XSERVERNAME) +#endif #ifndef CompressManCmd #define CompressManCmd gzip -n @@ -1818,7 +1833,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes ADMINMANSUFFIX = AdminManSuffix /* suffix for admin command man pages */ MANSRCSUFFIX = ManSrcSuffix /* suffix for man page source */ MANNEWSUFFIX = ManNewSuffix /* suffix for preprocessed man source */ - MANDEFS = AppLoadDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs $(XORGMANDEFS) $(VENDORMANDEFS) + MANDEFS = AppLoadDefs AppManDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs $(XORGMANDEFS) $(VENDORMANDEFS) COMPRESSMANCMD = CompressManCmd @@ -2000,7 +2015,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES) CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib $(INSTALLED_LIBS) @@ -2111,6 +2126,7 @@ FixupLibReferences() LDPOSTLIBS = LdPostLibs TOP_INCLUDES = TopIncludes PROJECT_DEFINES = ProjectDefines + VENDOR_DEFINES = VendorDefines #if HasCplusplus CXXPROJECT_DEFINES = CplusplusProjectDefines #endif @@ -586,7 +586,7 @@ InstallManPageAliasesBase(file,destdir,aliases) #endif #if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) -# include <xfree86.cf> +# include <xorg.cf> #endif /* @@ -618,7 +618,7 @@ InstallManPageAliasesBase(file,destdir,aliases) #define BuildXF86VidModeExt NO #define BuildXF86DGA NO #define BuildXInputExt NO -#include <xfree86.cf> +#include <xorg.cf> #endif /* @@ -402,16 +402,16 @@ install:: fonts.alias @@\ # define SharedLibXThrStub NO # endif -# ifndef XF86Server +# ifndef XorgServer # if OSMajorVersion == 3 && OSMinorVersion >= 2 || OSMajorVersion > 3 -# define XF86Server YES +# define XorgServer YES # else -# define XF86Server NO +# define XorgServer NO # endif # endif /* Definitions for building the XFree86 server */ -# if XF86Server +# if XorgServer # ifndef HasNetBSDApertureDriver # define HasNetBSDApertureDriver YES # endif @@ -427,9 +427,9 @@ install:: fonts.alias @@\ # endif # define UseMatroxHal NO /* Matrox HAL is i386 only */ -# endif /* XF86Server */ +# endif /* XorgServer */ -# include <xfree86.cf> +# include <xorg.cf> #endif /* AlphaArchitecture */ @@ -522,7 +522,7 @@ install:: fonts.alias @@\ # define HasX86Support UseElfFormat # endif -# include <xfree86.cf> +# include <xorg.cf> #endif /* i386Architecture */ @@ -559,7 +559,7 @@ install:: fonts.alias @@\ # define ServerExtraDefines -DXFree86Server -# include <xfree86.cf> +# include <xorg.cf> #endif /* AmigaArchitecture */ @@ -580,7 +580,7 @@ install:: fonts.alias @@\ # define ServerExtraDefines -DXFree86Server -#include <xfree86.cf> +#include <xorg.cf> #endif /* Hp300Architecture */ @@ -596,7 +596,7 @@ install:: fonts.alias @@\ # define ServerExtraDefines -DXFree86Server -# include <xfree86.cf> +# include <xorg.cf> #endif /* mac68kArchitecture */ @@ -612,7 +612,7 @@ install:: fonts.alias @@\ # define ServerExtraDefines -DXFree86Server -# include <xfree86.cf> +# include <xorg.cf> #endif /* Mvme68kArchitecture */ @@ -672,7 +672,7 @@ install:: fonts.alias @@\ # define XFree86ConsoleDefines -DPCCONS_SUPPORT # endif -# include <xfree86.cf> +# include <xorg.cf> #endif /* ArcArchitecture */ @@ -716,12 +716,12 @@ install:: fonts.alias @@\ # endif # endif -# ifndef XF86Server -# define XF86Server YES +# ifndef XorgServer +# define XorgServer YES # endif /* Definitions for building the X server */ -# if XF86Server +# if XorgServer # define ServerOSDefines XFree86ServerOSDefines \ -DDDXTIME -DDDXOSINIT # define ServerExtraDefines GccGasOption XFree86ServerDefines @@ -743,9 +743,9 @@ install:: fonts.alias @@\ # define UsbMouseSupport YES # endif -# endif /* XF86Server */ +# endif /* XorgServer */ -# include <xfree86.cf> +# include <xorg.cf> #endif /* PpcArchitecture */ @@ -792,7 +792,7 @@ install:: fonts.alias @@\ # define BuildXF86VidModeExt NO # define BuildXF86DGA NO # define BuildXInputExt NO -# include <xfree86.cf> +# include <xorg.cf> #endif /* SparcArchitecture */ @@ -806,8 +806,8 @@ install:: fonts.alias @@\ # define HasWeakSymbols YES # endif -# ifndef XF86Server -# define XF86Server YES +# ifndef XorgServer +# define XorgServer YES # endif # define ServerExtraDefines GccGasOption -D_XSERVER64 XFree86ServerDefines @@ -815,14 +815,14 @@ install:: fonts.alias @@\ -DDDXTIME -DDDXOSINIT # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -# if XF86Server +# if XorgServer # ifndef DoLoadableServer # define DoLoadableServer NO # endif # define XFree86ConsoleDefines -DWSCONS_SUPPORT # endif -# include <xfree86.cf> +# include <xorg.cf> #endif /* Sparc64Architecture */ @@ -849,7 +849,7 @@ install:: fonts.alias @@\ # define BuildGlxExt NO # define BuildGLXLibrary NO -# include <xfree86.cf> +# include <xorg.cf> #endif /* VaxArchitecture */ @@ -90,5 +90,5 @@ XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.3 2000/07/07 20:06:56 tsi Ex #define ExtraFilesToClean *.err *.map #include <QNX4.rules> -#include <xfree86.cf> +#include <xorg.cf> diff --git a/Server.tmpl b/Server.tmpl index 51147e2..bb769c5 100644 --- a/Server.tmpl +++ b/Server.tmpl @@ -73,3 +73,7 @@ GLX_DEFINES = GlxDefines #ifdef XFree86Version #include <xf86.tmpl> #endif + +#ifdef XorgVersion +#include <xorg.tmpl> +#endif @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.1.4.7.2.7.2.2 2004/03/19 17:08:59 eich Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.1.4.7.2.7.2.6 2004/03/24 15:58:45 eich Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -42,15 +42,28 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ /* X.Org release string */ #ifndef XOrgReleaseString -#define XOrgReleaseString Release 6.6 +# if defined XorgVersionString +# define XOrgReleaseString Release XorgVersionString +# else +# define XOrgReleaseString Release 6.7 +# endif #endif #ifndef XOrgManNameString #define XOrgManNameString X Version 11 #endif - -XORGRELSTRING = XOrgReleaseString -XORGMANNAME = XOrgManNameString +#ifndef XOrgNameString +# define XOrgNameString The X.Org Foundation +#endif +#ifndef XOrgNameStringShort +# define XOrgNameStringShort X.Org +#endif +#ifndef XOrgStdFilePrefix +# define XOrgStdFilePrefix xorg +#endif +#ifndef XOrgWebSupportAddress +# define XOrgWebSupportAddress http://wiki.X.Org +#endif #ifndef XOrgManDefs #define XOrgManDefs -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' @@ -62,14 +75,32 @@ XORGMANNAME = XOrgManNameString #ifndef XVendorManVersionString #define XVendorManVersionString XOrgReleaseString #endif - -VENDORMANNAME = XVendorManNameString -VENDORMANVERSION = XVendorManVersionString +#ifndef XVendorNameString +# define XVendorNameString XOrgNameString +#endif +#ifndef XVendorNameStringShort +# define XVendorNameStringShort XOrgNameStringShort +#endif +#ifndef XVendorWebSupport +# define XVendorWebSupport XOrgWebSupportAddress +#endif +#ifndef XVendorStdFilePrefix +# define XVendorStdFilePrefix XOrgStdFilePrefix +#endif #ifndef VendorManDefs #define VendorManDefs -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" #endif +#ifndef VendorDefines +#define VendorDefines -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' +#endif + +#ifndef VendorSupportDefines +# if defined XVendorWebSupport +# define VendorSupportDefines -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"' +# endif +#endif /* * X-specific things */ @@ -334,7 +365,7 @@ VENDORMANVERSION = XVendorManVersionString #define BuildDPMS YES #endif #ifndef BuildFontLib -#if !defined(XF86Server) || !XF86Server +#if (!defined(XF86Server) || !XF86Server) && (!defined (XorgServer) || !XorgServer) #define BuildFontLib (BuildLibraries || BuildServer) #else #define BuildFontLib (BuildLibraries || \ @@ -489,7 +520,7 @@ VENDORMANVERSION = XVendorManVersionString #ifndef BuildGlxExt #define BuildGlxExt NO #else -#if BuildGlxExt && !defined(XFree86Version) +#if BuildGlxExt && !defined(XFree86Version) && !defined(XorgVersion) #undef BuildXF86DRI #undef BuildXF86DRM #undef BuildXF86DRIDriverSupport @@ -930,6 +961,12 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #ifndef XkbServerDefines #define XkbServerDefines /**/ #endif +#ifndef XkbDefRulesDefines +#define XkbDefRulesDefines -D__XKBDEFRULES__='"$(XKBDEFRULES)"' +#endif +# ifndef XkbDefaultRulesFile +# define XkbDefaultRulesFile XVendorStdFilePrefix +#endif #ifndef LbxDefines #if BuildLBX #define LbxDefines -DLBX @@ -1645,9 +1682,25 @@ XCOMM X Window System make variables; these need to be coordinated with rules #ifdef X11ProjectRoot XPROJECTROOT = X11ProjectRoot #endif - + VENDORMANNAME = XVendorManNameString + VENDORMANVERSION = XVendorManVersionString XORGMANDEFS = XOrgManDefs VENDORMANDEFS = VendorManDefs + VENDORNAME = XVendorNameString + VENDORNAMESHORT = XVendorNameStringShort + +#if defined (XVendorWebSupport) + VENDORWEBSUPPORT = XVendorWebSupport +#endif +VENDORSUPPORTDEFS = VendorSupportDefines + + XKBDEFRULES = XkbDefaultRulesFile + XKBDEFRULESDEFS = XkbDefRulesDefines + + XCONFIGFILE = XConfigFile + XCONFIGDIR = XConfigDir + XLOGFILE = XLogFile + XSERVERNAME = XServerName #if HasSharedLibraries #ifndef DontUseLibPathVar @@ -327,7 +327,7 @@ install.man:: @@\ #ifdef i386Architecture #define i386Bsd 1 #define i386Bsdi 1 -#include <xfree86.cf> +#include <xorg.cf> #endif #ifdef SparcArchitecture @@ -341,6 +341,11 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 her #define XF86Server NO /* + * Don't build the Xorg server + */ +#define XorgServer NO + +/* * Try to avoid building anything related to graphics cards */ #define XFShadowFB NO @@ -400,4 +405,4 @@ XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.56 2003/10/27 22:34:02 her case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done #include <cygwin.rules> -#include <xfree86.cf> +#include <xorg.cf> @@ -303,5 +303,5 @@ clean:: @@\ #endif /* include all the XFree86 rules */ -#include <xfree86.cf> +#include <xorg.cf> @@ -181,5 +181,5 @@ XCOMM i386Architecture XCOMM XXX Might need this if they are not careful with slashes. XCOMM #define DirFailPrefix - -#include <xfree86.cf> +#include <xorg.cf> @@ -998,7 +998,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #endif #include <lnxLib.rules> -# include <xfree86.cf> +# include <xorg.cf> #ifndef XFree86ServerOSDefines # define XFree86ServerOSDefines @@ -399,4 +399,4 @@ install.man:: list @@\ #include <lynxLib.rules> #endif -#include <xfree86.cf> +#include <xorg.cf> @@ -68,5 +68,5 @@ XCOMM operating system: OSName #endif #ifdef i386Architecture -# include <xfree86.cf> +# include <xorg.cf> #endif @@ -61,4 +61,4 @@ XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.5 1999/07/10 07:24:33 dawes $(RM) $*.i.s #endif -#include <xfree86.cf> +#include <xorg.cf> @@ -144,5 +144,5 @@ #define ExtraFilesToClean *.err *.map #include <nto.rules> -#include <xfree86.cf> +#include <xorg.cf> @@ -208,6 +208,6 @@ _NULLCMD_ = #include <os2.rules> #include <os2Lib.rules> -# include <xfree86.cf> +# include <xorg.cf> @@ -201,6 +201,6 @@ install.man:: @@\ #endif /* SCO 3.2.4 and SCO 3.2.2 section */ #ifdef i386Architecture -#include <xfree86.cf> +#include <xorg.cf> #endif @@ -267,4 +267,4 @@ src.o: src.S @@\ #include <scoLib.rules> /* minor changes to sv4Lib.rules */ #include <sv4Lib.rules> -#include <xfree86.cf> +#include <xorg.cf> @@ -169,7 +169,7 @@ XCOMM operating system: OSName V/**/OSMajorVersion./**/OSMinorVersion./**/OSTee #define BuildXF86MiscExt NO /* turn off the server portion */ #define BuildXF86VidModeExt NO /* turn off the server portion */ #define BuildXInputExt YES -#define BuildXKBuilib YES /* override NO set in xfree86.cf */ +#define BuildXKBuilib YES /* override NO set in xorg.cf */ #define ConnectionFlags -DTCPCONN #define DefaultSystemPath /bin:/etc:/usr/bin:$(BINDIR) #define DefaultUserPath :/bin:/usr/bin:$(BINDIR) @@ -443,6 +443,6 @@ XCOMM HIDESYMS is for filtering system library symbols. #endif /* UseHidesymsLists */ #if OSMajorVersion >= 4 -#include <xfree86.cf> +#include <xorg.cf> #include <sequentLib.rules> /* include after macros, before Motif.rules */ #endif /* OSMajorVersion >= 4 */ @@ -316,4 +316,4 @@ clean:: @@\ #define DoLoadableServer YES #endif -#include <xfree86.cf> +#include <xorg.cf> @@ -38,12 +38,12 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex * Include this for easy XFree86 customisations */ #ifndef SiteIConfigFiles -#define SiteIConfigFiles $(IRULESRC)/xf86site.def $(IRULESRC)/host.def +#define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def #endif #include <host.def> -#include <xf86site.def> +#include <xorgsite.def> /* On systems where cpp doesn't correctly expand macros in include directives * the two following macros need to be defined directly (where "X11" is @@ -138,7 +138,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex /* You MAY need SetUID if users run the server by hand or under xinit */ /* Consult your system administrator before making the X server setuid */ /* -#ifdef XFree86Version +#if defined(XFree86Version) || defined (XorgVersion) #define InstallXserverSetUID YES #endif */ diff --git a/site.sample b/site.sample index 1ced85a..e712f7d 100644 --- a/site.sample +++ b/site.sample @@ -60,7 +60,7 @@ XCOMM site: $Xorg: site.sample,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ #ifdef AfterVendorCF -#define ProjectRoot /usr/X11R6.4 +#define ProjectRoot Concat(/usr/X11R,XORG_VERSION_MAJOR.XORG_VERSION_MINOR) /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ /* #define HasXdmAuth YES */ @@ -109,7 +109,7 @@ XCOMM site: $Xorg: site.sample,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* You MAY need SetUID if users run the server by hand or under xinit */ /* Consult your system administrator before making the X server setuid */ /* -#ifdef XFree86Version +#if defined(XFree86Version) || defined(XorgVersion) #define InstallXserverSetUID YES #endif */ @@ -343,6 +343,6 @@ InstallManPageAliasesBase(file,destdir,aliases) #include <sv3Lib.rules> #ifdef i386Architecture -#include <xfree86.cf> +#include <xorg.cf> #endif @@ -265,7 +265,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.50 2003/11/04 01:25:31 dawes Exp $ #ifndef DoLoadableServer #define DoLoadableServer YES #endif -#include <xfree86.cf> +#include <xorg.cf> #endif #ifndef DoLoadableServer @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.32 2002/11/14 21:01:14 tsi Exp $ #ifdef BuilderEMailAddr BUILDERADDR = BuilderEMailAddr #else -BUILDERADDR = "xfree86@xfree86.org" +BUILDERADDR = "xorg@freedesktop.org" #endif BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' @@ -0,0 +1,2027 @@ +XCOMM $XdotOrg$ +/* + * This configuration file contains all of the configuration + * information for the Xorg based X Servers. + * + * Most of these settings can be overridden in a vendor.cf or the + * BeforeVendor part of the site.def file. + */ +XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ + +/* Get and set version information. */ + +#include "date.def" + +#define XORG_VERSION_MAJOR 6 +#define XORG_VERSION_MINOR 7 +#define XORG_VERSION_PATCH 0 +#define XORG_VERSION_SNAP 0 + +#if !defined(XorgVersionString) && \ + defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \ + defined(XORG_VERSION_PATCH) && defined(XORG_VERSION_SNAP) +# if XORG_VERSION_SNAP == 0 +# if XORG_VERSION_PATCH == 0 +# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR | sed 's/ /./g'` +# else +# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH | sed 's/ /./g'` +# endif +#else +# define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH XORG_VERSION_SNAP | sed 's/ /./g'` +# endif +#endif + +#if !defined(XORG_DATE) && defined(XF86_DATE) +# define XORG_DATE XF86_DATE +#endif + +/* + * Xorg versions are M.m.P.s, and XorgVersion is: + * + * M * 10000000 + m * 100000 + P * 1000 + s + * + */ + +#ifndef XorgVersion +# define XorgVersion (((XORG_VERSION_MAJOR) * 10000000) + ((XORG_VERSION_MINOR) * 100000) + ((XORG_VERSION_PATCH) * 1000) + XORG_VERSION_SNAP) +#endif + +#ifndef VersionDefines +# define VersionDefines -DXORG_VERSION_CURRENT="$(XORG_VERSION_CURRENT)" +#endif + +/* Place the version of the relevant changelog file here */ +#ifndef ReleaseVersion +# define ReleaseVersion RELEASE-1 +#endif + +XORG_VERSION_CURRENT = XorgVersion +RELEASE_VERSION = ReleaseVersion + +#if !defined(XorgManVersionString) && \ + defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \ + defined(XORG_VERSION_PATCH) && defined(XORG_VERSION_SNAP) +# if XORG_VERSION_SNAP == 0 +#define XorgManVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +#else +#define XorgManVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH XORG_VERSION_SNAP | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +# endif +#endif + +#if !defined(XFree86DateString) && defined(XORG_DATE) +# define XFree86DateString XORG_DATE +#endif + +#ifndef BuildDateCmd +# define BuildDateCmd date +%Y%m%d +#endif + +#if !defined(BuildDate) +# define BuildDate `BuildDateCmd` +#endif + +#ifndef ChangelogDateCmd +# define ChangelogDateCmd if tail $(CHANGELOGFILE) 2>/dev/null | \ @@\ + fgrep '$$XdotOrg:' >/dev/null 2>&1; then \ @@\ + tail $(CHANGELOGFILE) | fgrep '$$XdotOrg:' | \ @@\ + sed s,'.* \([0-9][0-9]*\)/\([0-9][0-9]*\)/\([0-9][0-9]*\).*,\1\2\3,'; \ @@\ + else echo 0; fi +#endif + +#if !defined(ChangelogDate) +# define ChangelogDate `ChangelogDateCmd` +#endif + +#ifndef XVendorString +# define XVendorString "The X.Org Foundation" +#endif + +#ifndef XVendorRelease +# define XVendorRelease XorgVersion +#endif + +#ifndef XVendorManVersionString +#define XVendorManVersionString XorgManVersionString +#endif + +#ifndef XVendorManNameString +#define XVendorManNameString X.Org +#endif + +/* + * This enables some settings for developers. + */ + +#ifndef XFree86Devel +# if !defined(PatheticCpp) || !PatheticCpp +# if (XorgVersion % 1000) +# define XFree86Devel YES +# else +# define XFree86Devel NO +# endif +# else +# define XFree86Devel NO /* Assume the worst */ +# endif +#endif + +#ifndef BuildDebug +# define BuildDebug YES +#endif + +/* + * settings for the config file parser + */ + +#ifndef XConfigFile +#define XConfigFile xorg.conf +#endif +#ifndef XConfigDir +#define XConfigDir $(LIBDIR) +#endif +#ifndef XLogFile +#define XLogFile Xorg +#endif +#ifndef XServerName +# define XServerName Xorg +#endif + +/* + * BuildXFree86ConfigTools: + * + * Turning this on allows the XFree86 config tools to build when + * BuildServersOnly is YES. This requires more than the servonly CVS + * module. This cannot be used to disable building the config tools with + * a full build. + */ +#ifndef BuildXFree86ConfigTools +#ifdef BuildServersOnly +#define BuildXFree86ConfigTools !BuildServersOnly +#else +#define BuildXFree86ConfigTools YES +#endif +#endif + +#ifndef BuildLibrariesForConfigTools +#define BuildLibrariesForConfigTools BuildXFree86ConfigTools +#endif + +#if BuildXFree86ConfigTools && BuildLibrariesForConfigTools +#define BuildLibraries YES +#define BuildXF86MiscLibrary YES +#define BuildXF86VidModeLibrary YES +#define BuildXKBlib YES +#define BuildXKBfilelib YES +#define BuildXKBuilib YES +#endif + +/* + * When this is set, modules are always built separately from the libraries + * that statically link into an Xserver. This is for platforms where the + * module and native object formats are different (e.g., OS/2). + */ +#ifndef BuildModuleInSubdir +#define BuildModuleInSubdir NO +#endif + +#ifndef MakeDllModules +#define MakeDllModules NO +#endif +#ifndef DoLoadableServer +#define DoLoadableServer NO +#endif + +/* + * Default settings for which X Servers to build. + */ + +/* OS.cf files may set this for OS-specific input drivers */ +#ifndef OSXInputDrivers +#define OSXInputDrivers /**/ +#endif + +/* This may be set in host.def for 3rd party input drivers */ +#ifndef ExtraXInputDrivers +#define ExtraXInputDrivers /**/ +#endif + +/* XInput drivers */ +#ifndef XInputDrivers +#define XInputDrivers mouse keyboard acecad calcomp citron \ + digitaledge dmc dynapro elographics tek4957 \ + microtouch mutouch penmount spaceorb summa \ + wacom void magellan /* magictouch */ hyperpen \ + jamstudio fpit \ + palmax OSXInputDrivers ExtraXInputDrivers +#endif + +/* <linux/input.h> support mainly for USB support */ +#ifndef HasLinuxInput +# define HasLinuxInput NO +#endif + +/* OS.cf files may set this for OS-specific drivers */ +#ifndef XF86OSCardDrivers +#define XF86OSCardDrivers /**/ +#endif + +/* This may be set in host.def for 3rd party drivers */ +#ifndef XF86ExtraCardDrivers +#define XF86ExtraCardDrivers /**/ +#endif + +/* OS.cf files may set this for OS-specific drivers */ +#ifndef HasAgpGart +#define HasAgpGart NO +#endif + +/* The glide driver only works for the loadable server at the moment */ +#ifndef HasGlide2 +#define HasGlide2 NO +#endif +#if HasGlide2 && DoLoadableServer +#define GlideDriver glide +#else +#define GlideDriver /**/ +#endif + +/* + * There are three parameters that determine where and how the Matrox HAL + * library is used: + * + * HaveMatroxHal -- You have the HALlib.a binary library installed + * in xfree86/drivers/mga/HALlib, and you want it to + * be used. + * Default: NO + * + * BuildMatroxHal -- You have the source for the HALlib library (installed + * in xfree86/drivers/mga/hallib), and want to build and + * use it. + * Default: NO + * + * UseMatroxHal -- You want to build support for loading/using the HAL + * library into the mga driver. For module server builds + * you don't need to have the HALlib library to do this. + * but you want to build support for loading it and using + * it into the mga driver module. + * Default: YES for loadable server build + * (HaveMatroxHal || BuildMatroxHal) for static + */ + +#ifndef HaveMatroxHal +#define HaveMatroxHal NO +#endif + +#ifndef BuildMatroxHal +#define BuildMatroxHal NO +#endif + +#ifndef UseMatroxHal +#if DoLoadableServer +#define UseMatroxHal YES +#else +#define UseMatroxHal (HaveMatroxHal || BuildMatroxHal) +#endif +#endif + +/* + * For Intel platforms, the default is to build all modules which + * are supported on this platform. + */ +#if defined(i386Architecture) || defined(ia64Architecture) +# ifndef XorgServer +# define XorgServer YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +/* + * Amiga framebuffer module. + * This is mostly for build testing, but the vesa driver references it. + */ +# ifndef XF86AFB +# define XF86AFB YES +# endif + +# define AgpGartDrivers /**/ + +/* + * Drivers under development, but not ready for binary releases, or + * drivers included on this platform only for build testing. + */ +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers imstt newport +# else +# define DevelDrivers /**/ +# endif +# endif + +/* Pure PCI drivers should go first */ +# ifndef XF86CardDrivers +# /* Don't build the nsc driver on IA64 */ +# ifndef ia64Architecture +# define NscDriver nsc +# else +# define NscDriver /**/ +# endif +# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + GlideDriver i128 NscDriver \ + ati i810 AgpGartDrivers DevelDrivers ark \ + cyrix siliconmotion via \ + fbdev vesa vga \ + dummy XF86OSCardDrivers XF86ExtraCardDrivers +# endif + +/* + * DRI drivers under development, or drivers included on this platform + * only for build testing. + */ +# ifndef DevelDRIDrivers +# if XFree86Devel +# define DevelDRIDrivers ffb +# else +# define DevelDRIDrivers /**/ +# endif +# endif + +# ifndef DriDrivers +# define DriDrivers gamma i810 i830 mga r128 radeon r200 \ + sis tdfx DevelDRIDrivers +# endif +#endif + +#if defined(AMD64Architecture) +# ifndef XorgServer +# define XorgServer YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif + +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# define AgpGartDrivers /**/ + +# define DevelDrivers /**/ + +/* Pure PCI drivers should go first */ +# ifndef XF86CardDrivers +# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ + neomagic tdfx savage cirrus tseng trident \ + chips apm i128 ati ark cyrix siliconmotion \ + vga dummy fbdev vesa +# endif + +/* DRI tdfx driver needs Glide, which is not available for AMD64 */ +# define TdfxDriDriver /**/ + +# define DevelDRIDrivers /**/ + +# define DriDrivers gamma i810 mga r128 radeon r200 \ + TdfxDriDriver DevelDRIDrivers +#endif /*AMD64Arcitecture*/ + +/* SPARC and UltraSPARC drivers */ + +#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ + !defined(LynxOSArchitecture) && \ + !defined(NetBSDArchitecture) && \ + !defined(OpenBSDArchitecture) +# ifndef XorgServer +# define XorgServer YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32wid fb module */ +# ifndef XF8_32Wid +# define XF8_32Wid YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# ifndef DevelDrivers +# if XFree86Devel + /* + * Some of these are compiled just for the fun of it. Undoubtedly some + * require changes (or even removal) for things like endianness, etc. Move + * those known to work into the main XF86CardDrivers #define. + */ +# define DevelDrivers apm ark chips cirrus i128 i740 i810 imstt \ + neomagic newport nv rendition s3virge savage \ + siliconmotion tga trident vmware dummy +# else +# define DevelDrivers /* */ +# endif +# endif + +/* Pure SBUS and PCI drivers should go first */ +# ifndef XF86CardDrivers +# define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ + sunbw2 glint mga tdfx ati vesa vga fbdev \ + XF86OSCardDrivers XF86ExtraCardDrivers \ + DevelDrivers +# endif +# ifndef DriDrivers +# define DriDrivers ffb +# endif + +#endif + +/* Sparc64 Drivers */ +#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) +# ifndef XorgServer +# define XorgServer YES +# endif +/* Amiga framebuffer module */ +# ifndef XF86AFB +# define XF86AFB NO +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif + +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +# ifndef UseX86Emu +# define UseX86Emu NO +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers /* */ +# else +# define DevelDrivers /* */ +# endif +# endif + +/* Pure PCI drivers should go first */ +# ifndef XF86CardDrivers +# define XF86CardDrivers ati \ + DevelDrivers \ + XF86OSCardDrivers XF86ExtraCardDrivers +# endif +# define TdfxDriDriver /**/ +# ifndef DriDrivers +# define DriDrivers /**/ +# endif +#endif + +/* MIPS drivers */ + +#ifdef MipsArchitecture +# ifndef XorgServer +# define XorgServer YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif + +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers /* */ +# else +# define DevelDrivers /* */ +# endif +# endif + +# ifndef XF86CardDrivers +# define XF86CardDrivers mga glint nv s3 s3virge sis savage \ + trident chips tdfx fbdev ati \ + DevelDrivers newport \ + XF86OSCardDrivers XF86ExtraCardDrivers +# endif +#endif + +/* + * DEC Alpha drivers + */ +#ifdef AlphaArchitecture +# ifndef XorgServer +# define XorgServer YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers /* */ +# else +# define DevelDrivers /* */ +# endif +# endif + +/* Pure PCI drivers should go first */ +# ifndef XF86CardDrivers +# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga ati \ + savage nv cirrus DevelDrivers siliconmotion \ + vga XF86OSCardDrivers XF86ExtraCardDrivers +# endif +# ifndef DriDrivers +# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/ +# endif +#endif + +/* + * Motorola 68k and PowerPC drivers + */ +#if defined(PpcArchitecture) || defined(Mc68020Architecture) +# ifndef XorgServer +# define XorgServer YES +# endif +/* Amiga framebuffer module */ +# ifndef XF86AFB +# define XF86AFB YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers imstt +# else +# define DevelDrivers /* */ +# endif +# endif + +/* Pure PCI drivers should go first */ +# ifndef XF86CardDrivers +# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ + trident chips tdfx fbdev \ + DevelDrivers vga \ + XF86OSCardDrivers XF86ExtraCardDrivers +# endif +# ifndef DriDrivers +# define DriDrivers gamma tdfx mga r128 radeon r200 +# endif +#endif + +/* + * Intel StrongARM and Hewlett-Packard PA-RISC + */ +#if defined(Arm32Architecture) || defined(HPArchitecture) +# ifndef XorgServer +# define XorgServer YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers /* */ +# else +# define DevelDrivers /* */ +# endif +# endif + +/* Pure PCI drivers should go first */ +# ifndef XF86CardDrivers +# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ + trident chips tdfx fbdev \ + DevelDrivers vga \ + XF86OSCardDrivers XF86ExtraCardDrivers +# endif +# if HasGlide3 +# define TdfxDriDriver tdfx +# else +# define TdfxDriDriver /**/ +# endif +# ifndef DriDrivers +# define DriDrivers gamma tdfx mga r128 radeon r200 +# endif +#endif + +/* SuperH drivers */ + +#if defined(SuperHArchitecture) +# ifndef XorgServer +# define XorgServer YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif +/* vbe module */ +# ifndef XF86VBE +# define XF86VBE YES +# endif + +# ifndef XF86CardDrivers +# define XF86CardDrivers fbdev XF86OSCardDrivers XF86ExtraCardDrivers +# endif +#endif + + +/* + * For Mips/Arc platforms, the default is to build all modules which + * are supported on this platform. + */ +#ifdef ArcArchitecture +# ifndef XorgServer +# define XorgServer YES +# endif +#endif + +#if BuildDebug +# define DebugDefines -DBUILDDEBUG +#else +# define DebugDefines /**/ +#endif + +#ifndef XorgServer +# define XorgServer NO +#endif +#if !XorgServer +# undef DoLoadableServer +# define DoLoadableServer NO +#endif + +/* + * Fbdev module defines. They are set to indicate the fb types supported + * on different architectures. + */ +#ifndef XF86AFB +# define XF86AFB NO +#endif +#ifndef XF86ILBM +# define XF86ILBM NO +#endif +#ifndef XF86IPLAN2P2 +# define XF86IPLAN2P2 NO +#endif +#ifndef XF86IPLAN2P4 +# define XF86IPLAN2P4 NO +#endif +#ifndef XF86IPLAN2P8 +# define XF86IPLAN2P8 NO +#endif +#if XF86AFB +AFB_DEFS = -DUSE_AFB +#endif +#if XF86ILBM +ILBM_DEFS = -DUSE_ILBM +#endif +#if XF86IPLAN2P2 +IPLAN2P2_DEFS = -DUSE_IPLAN2P2 +#endif +#if XF86IPLAN2P4 +IPLAN2P4_DEFS = -DUSE_IPLAN2P4 +#endif +#if XF86IPLAN2P8 +IPLAN2P8_DEFS = -DUSE_IPLAN2P8 +#endif +#ifndef FbdevDefines +# define FbdevDefines $(AFB_DEFS) $(ILBM_DEFS) $(IPLAN2P2_DEFS) \ + $(IPLAN2P4_DEFS) $(IPLAN2P8_DEFS) +#endif + +/* + * The default is to install the X servers setuid-root on most OSs. + * It the servers are only started by xdm, they should not be setuid-root. + */ +#if !defined(i386MachArchitecture) && !defined(OS2Architecture) +# ifndef InstallXserverSetUID +# define InstallXserverSetUID YES +# endif +#endif + +/* + * Build GLX server interface + * --- Doesn't work for 1-bit and 4-bit servers + */ +#ifndef BuildGlxExt +# define BuildGlxExt YES +#endif + +#ifndef BuildXF86DRI +#define BuildXF86DRI NO +#endif + +#ifndef BuildXF86DRM +#define BuildXF86DRM NO +#endif + +#ifndef GlxUseSGISI +#define GlxUseSGISI NO +#endif + +#if BuildXF86DRI + +#ifndef BuildGLXLibrary +# if defined (BuildServersOnly) && BuildServersOnly +# define BuildGLXLibrary NO +# else +# define BuildGLXLibrary YES +# endif +#endif + +#ifndef BuildXF86OldDRMCompat +# define BuildXF86OldDRMCompat YES +#endif + +/* + * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. + * If more than one are defined, the compilation will fail with multiply + * defined references of GLX and OpenGL functions. + */ + +/* + * The first is a built-in driver that does software rendering client-side + * and renders to the X server via Xlib. + */ + +# ifndef GlxBuiltInXMesa +# define GlxBuiltInXMesa NO +# endif + +/* + * The rest are hardware-specific DRI drivers. + */ +# ifndef GlxBuiltInGamma +# define GlxBuiltInGamma NO +# endif +# ifndef GlxBuiltInTdfx +# define GlxBuiltInTdfx NO +# endif +# ifndef GlxBuiltInMga +# define GlxBuiltInMga NO +# endif +# ifndef GlxBuiltInI810 +# define GlxBuiltInI810 NO +# endif +# ifndef GlxBuiltInI830 +# define GlxBuiltInI830 NO +# endif +# ifndef GlxBuiltInR128 +# define GlxBuiltInR128 NO +# endif +# ifndef GlxBuiltInRadeon +# define GlxBuiltInRadeon NO +# endif +# ifndef GlxBuiltInR200 +# define GlxBuiltInR200 NO +# endif +# ifndef GlxBuiltInFfb +# define GlxBuiltInFfb NO +# endif +# ifndef GlxBuiltInSIS +# define GlxBuiltInSIS NO +# endif + +# if GlxBuiltInTdfx || \ + GlxBuiltInMga || \ + GlxBuiltInI810 || \ + GlxBuiltInI830 || \ + GlxBuiltInR128 || \ + GlxBuiltInRadeon || \ + GlxBuiltInR200 || \ + GlxBuiltInFfb || \ + GlxBuiltInSIS +# define GlxDriverUsesMesa YES +# else +# define GlxDriverUsesMesa NO +# endif + +# if GlxBuiltInGamma || \ + GlxBuiltInTdfx || \ + GlxBuiltInMga || \ + GlxBuiltInI810 || \ + GlxBuiltInI830 || \ + GlxBuiltInR128 || \ + GlxBuiltInRadeon || \ + GlxBuiltInR200 || \ + GlxBuiltInFfb || \ + GlxBuiltInSIS +# define GlxUseBuiltInDRIDriver YES +# define DRIDynLoadDefines /**/ +# else +# define GlxUseBuiltInDRIDriver NO +# define DRIDynLoadDefines -DGLX_USE_DLOPEN +# endif + +# if GlxUseBuiltInDRIDriver +# undef DriDrivers +# if GlxBuiltInGamma +# define DriDrivers gamma +# endif +# if GlxBuiltInTdfx +# define DriDrivers tdfx +# endif +# if GlxBuiltInMga +# define DriDrivers mga +# endif +# if GlxBuiltInI810 +# define DriDrivers i810 +# endif +# if GlxBuiltInI830 +# define DriDrivers i830 +# endif +# if GlxBuiltInR128 +# define DriDrivers r128 +# endif +# if GlxBuiltInRadeon +# define DriDrivers radeon +# endif +# if GlxBuiltInR200 +# define DriDrivers r200 +# endif +# if GlxBuiltInSIS +# define DriDrivers sis +# endif +# if GlxBuiltInFfb +# define DriDrivers ffb +# endif +# endif + +#endif + +/* + * This enables building DRI support into video drivers, which can be done + * even on platforms that don't have functional DRI support. + * + * Defining BuildXF86DRIDriverSupport to YES will not work until we have a + * separate set of defines set up for building driver-only support for the + * DRI. + */ +#ifndef BuildXF86DRIDriverSupport +# define BuildXF86DRIDriverSupport NO +#endif + +#if BuildGlxExt + +# if BuildXF86DRI +# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines +# else +# define DRIDefines /**/ +# endif +# if defined(GlxUseSGISI) && GlxUseSGISI +# define GlxCoreLibDefines -DGLX_USE_SGI_SI +# else +# define GlxCoreLibDefines -DGLX_USE_MESA +# endif + +# if defined(SparcArchitecture) \ + || defined (Sparc64Architecture) \ + || defined(ia64Architecture) \ + || defined(s390xArchitecture) \ + || defined(AMD64Architecture) +# define GlxArchDefines -D__GLX_ALIGN64 +# elif defined(AlphaArchitecture) +/* On the Alpha we need to ensure floating point accuracy for 3D */ +# define GlxArchDefines -D__GLX_ALIGN64 -mieee +# elif defined(DarwinArchitecture) +/* GLX contains lots of uninitialized globals, which can upset Darwin */ +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif + +# ifndef GlxExtraDefines +# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines +# endif + +#else + +/* If we are not building GLX, then make sure the DRI is not built */ +# undef BuildXF86DRI +# define BuildXF86DRI NO +# undef BuildXF86DRIDriverSupport +# define BuildXF86DRIDriverSupport NO + +#endif + +#if !BuildXF86DRI +# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ +#endif + +# ifndef UseX86Emu +# define UseX86Emu YES +# endif + +#define X86INT10_STUB 0 +#define X86EMU_GENERIC 1 +#define X86VM 2 +#define X86EMU_OS 3 + +#ifndef XF86INT10_BUILD +# if UseX86Emu +# define XF86INT10_BUILD X86EMU_GENERIC +# else +# define XF86INT10_BUILD X86INT10_STUB +# endif +#endif +/* + * Build the Rush extension library (non standard extension for cooperation + * between glide library and X server). Enabled by default only for Linux. + */ +#ifndef BuildXF86RushExt +# define BuildXF86RushExt NO +#endif + +#ifndef BuildDBElib +# define BuildDBElib YES +#endif + +#ifndef BuildRECORDlib +# define BuildRECORDlib YES +#endif + +#ifndef BuildXKBlib +# define BuildXKBlib YES +#endif + +#ifndef BuildScreenSaverExt +# define BuildScreenSaverExt YES +#endif + +/* + * Build XInput support + */ +#ifndef BuildXInputExt +# define BuildXInputExt YES +#endif + +/* Build Xinerama (aka panoramiX) extension */ +#ifndef BuildXinerama +# define BuildXinerama YES +#endif + +/* Build Render extension */ +#ifndef BuildRender +# define BuildRender YES +#endif + +#if 0 +#ifndef JoystickSupport +# define JoystickSupport NO +#endif +#endif + +#if 0 +/* + * Build the extra extension libs even when not including the extra extensions + * in the servers + */ +#ifndef BuildScreenSaverLibrary +# define BuildScreenSaverLibrary YES +#endif +#ifndef BuildXF86MiscLibrary +# define BuildXF86MiscLibrary YES +#endif +#ifndef BuildXF86DGALibrary +# define BuildXF86DGALibrary YES +#endif +#ifndef BuildXF86VidModeLibrary +# define BuildXF86VidModeLibrary YES +#endif +#ifndef BuildXvLibrary +# define BuildXvLibrary YES +#endif +#ifndef BuildXvMCLibrary +# define BuildXvMCLibrary YES +#endif +#ifndef BuildGLXLibrary +# define BuildGLXLibrary YES +#endif +#ifndef BuildXResLibrary +# define BuildXResLibrary YES +#endif +#endif + +/* + * Build the XFree86-VidMode extension + */ +#ifndef BuildXF86VidModeExt +# define BuildXF86VidModeExt YES +#endif + +/* Don't build this now because the interface hasn't been done yet */ +/* + * Build the XFree86-Misc extension + */ +#ifndef BuildXF86MiscExt +# define BuildXF86MiscExt YES +#endif + +/* + * Build the XFree86-Bigfont extension + */ +#ifndef BuildXF86BigfontExt +# define BuildXF86BigfontExt YES +#endif + +/* + * Build the XFree86 DGA support + */ +#ifndef BuildXF86DGA +# define BuildXF86DGA YES +#endif + +/* + * Build the DPMS extension support + */ +#ifndef BuildDPMSExt +# define BuildDPMSExt YES +#endif + +/* + * Build the X Video Extension + */ +#ifndef BuildXvExt +# define BuildXvExt YES +#endif + +/* + * Build the X Video Motion Compensation Extension + */ +#ifndef BuildXvMCExt +# define BuildXvMCExt YES +#endif + +/* + * Build the X-Resource Extension + */ +#ifndef BuildXResExt +# define BuildXResExt YES +#endif + +#if Malloc0ReturnsNull +# ifndef XtMalloc0ReturnsNullDefines +# define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC +# endif +#endif + +#ifndef UseInternalMalloc +# define UseInternalMalloc NO +#endif + +#ifndef HasDlsymBug +# define HasDlsymBug NO +#endif + +#ifndef HasMTRRSupport +# define HasMTRRSupport NO +#endif + +/* + * The expiry date for beta versions + * + * 853286400 is Wed Jan 15 00:00:00 1997 GMT + * 855964800 is Sat Feb 15 00:00:00 1997 GMT + * 866332800 is Sun Jun 15 00:00:00 1997 GMT + */ +#ifndef XorgServerExpiry +# define XorgServerExpiry 0 +#endif + +/* + * Build the font server + */ +#ifndef BuildFontServer +# define BuildFontServer YES +#endif + +/* + * Include fonts support + */ +#ifndef BuildSpeedo +# define BuildSpeedo YES +#endif + +#ifndef BuildType1 +# define BuildType1 YES +#endif + +#ifndef BuildCID +# define BuildCID YES +#endif + +#ifndef BuildFreeType +# define BuildFreeType YES +#endif + +#ifndef BuildXTrueType +# define BuildXTrueType YES +#endif + +/* + * By default, build all of the fonts. + */ +#ifndef Build75DpiFonts +# define Build75DpiFonts YES +#endif +#ifndef Build100DpiFonts +# define Build100DpiFonts YES +#endif +#ifndef BuildSpeedoFonts +# define BuildSpeedoFonts YES +#endif +#ifndef BuildType1Fonts +# define BuildType1Fonts YES +#endif +#ifndef BuildCIDFonts +# define BuildCIDFonts YES +#endif +#ifndef BuildTrueTypeFonts +# define BuildTrueTypeFonts YES +#endif +#ifndef BuildCyrillicFonts +# define BuildCyrillicFonts YES +#endif + +/* + * Build scanpci? + */ +#ifndef SystemV +#define SystemV NO +#endif +#ifndef SystemV4 +#define SystemV4 NO +#endif +#ifndef BuildScanpci +# if SystemV || SystemV4 || \ + (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ + defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ + defined(OS2Architecture) || defined(GNUMachArchitecture) +# define BuildScanpci YES +# else +# define BuildScanpci NO +# endif +#endif + +#ifndef CompressAllFonts +# define CompressAllFonts YES +#endif + +#ifndef GzipFontCompression +# define GzipFontCompression YES +#endif + +/* Disable stripping installed programs for this release. */ +#ifndef StripInstalledPrograms +# define StripInstalledPrograms NO +#endif + +#ifndef InstallJapaneseDocs +#define InstallJapaneseDocs NO +#endif + +#if BuildXF86DGA +# define XFree86DGADefines -DXFreeXDGA +#else +# define XFree86DGADefines /**/ +#endif + +#if BuildXvExt +# define XFree86XvDefines -DXvExtension +#else +# define XFree86XvDefines /**/ +#endif + +#if BuildXvMCExt +# define XFree86XvMCDefines -DXvMCExtension +#else +# define XFree86XvMCDefines /**/ +#endif + +#if BuildXResExt +# define XFree86XResDefines -DXResExtension +#else +# define XFree86XResDefines /**/ +#endif + +#ifndef DlopenHack +# define DlopenHack -DDLOPEN_HACK +#endif + +#ifndef ExtraLoaderDefines +# if MakeDllModules +# define ExtraLoaderDefines DlopenHack +# else +# define ExtraLoaderDefines /**/ +# endif +#endif + +#if DoLoadableServer +# define XFree86LoaderDefines -DXFree86LOADER ExtraLoaderDefines +#else +# define XFree86LoaderDefines /**/ +#endif + +#ifndef HasBsdMake +#define HasBsdMake NO +#endif + +#ifndef MakeHasPosixVariableSubstitutions +# if !HasBsdMake && !defined(SunArchitecture) +# define MakeHasPosixVariableSubstitutions NO +# else +# define MakeHasPosixVariableSubstitutions YES +# endif +#endif + +#ifndef UseSmartScheduler +#define UseSmartScheduler YES +#endif + +#if UseSmartScheduler +#define SmartScheduleDefines -DSMART_SCHEDULE +#else +#define SmartScheduleDefines /**/ +#endif + +/* Server defines required for all OSs */ +#ifndef XFree86ServerDefines +# define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \ + XFree86DGADefines XFree86XvDefines \ + XFree86LoaderDefines -DXFree86Server \ + VidModeExtensionDefines \ + XFree86XvMCDefines \ + SmartScheduleDefines \ + DebugDefines XFree86XResDefines \ + -DX_BYTE_ORDER=$(X_BYTE_ORDER) \ + VersionDefines +#endif + +#ifndef XFree86ServerOSDefines +# define XFree86ServerOSDefines -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \ + -DDDXOSVERRORF +#endif + +#ifndef XFree86ConsoleDefines +# if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) +# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT +# elif defined(FreeBSDArchitecture) +# define XFree86ConsoleDefines -DSYSCONS_SUPPORT +# else +# define XFree86ConsoleDefines /**/ +# endif +#endif + +/* Support for USB mouse */ +#ifndef UsbMouseSupport +# define UsbMouseSupport NO +#endif +/* Does this OS have libusb ? */ +#ifndef HasLibUsb +# define HasLibUsb NO +#endif + +#ifndef UseServerLock +# define UseServerLock YES +#endif + +#ifndef XnestServer +# define XnestServer YES +#endif +#ifndef XVirtualFramebufferServer +# define XVirtualFramebufferServer YES +#endif +#ifndef XprtServer +# define XprtServer YES +#endif + +#ifndef ServerExtraDefines +# define ServerExtraDefines XFree86ServerDefines +#endif + +#ifndef ServerOSDefines +# define ServerOSDefines XFree86ServerOSDefines +#endif + +#ifndef DriverSDKDir +# define DriverSDKDir $(USRLIBDIR)/Server +#endif + +#ifndef DriverSDKModuleDir +# define DriverSDKModuleDir $(USRLIBDIR)/Server/modules +#endif + +#ifndef DriverSDKIncludeDir +# define DriverSDKIncludeDir $(USRLIBDIR)/Server/include +#endif + +DRIVERSDKDIR = DriverSDKDir +DRIVERSDKMODULEDIR = DriverSDKModuleDir +DRIVERSDKINCLUDEDIR = DriverSDKIncludeDir + +/* + * Some commonly refered to directories are defined here. + */ + + XF86SRC = $(SERVERSRC)/hw/xfree86 + XF86COMSRC = $(XF86SRC)/common + XF86PARSERSRC = $(XF86SRC)/parser + XF86OSSRC = $(XF86SRC)/os-support + XF86DRIVERSRC = $(XF86SRC)/drivers + DRIVERSRC = $(XF86DRIVERSRC) + +/* + * Installed location of the XFree86 documentation + */ + + XFREE86DOCDIR = $(DOCDIR) + XFREE86PSDOCDIR = $(DOCPSDIR) + XFREE86PDFDOCDIR = $(DOCPDFDIR) + XFREE86HTMLDOCDIR = $(DOCHTMLDIR) +XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese + +/* + * Other stuff used in the X Server source. + */ + +#ifndef OtherIConfigFiles +# define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules +#endif + +#ifndef UseRgbTxt +# define UseRgbTxt YES +#endif + +#ifndef ManSuffix +# define ManSuffix 1 +#endif + +/* + * GNU Compiler stuff + */ +#ifndef HasGcc3 +# define HasGcc3 NO +#endif +#ifndef HasGcc2 +# define HasGcc2 HasGcc3 +#endif +#ifndef HasGcc +# define HasGcc HasGcc2 +#endif +#ifndef HasGcc2ForCplusplus +# define HasGcc2ForCplusplus HasGcc2 +#endif + +#if HasGcc +# ifndef Gcc28Warnings +# if (GccMajorVersion > 2) || \ + ((GccMajorVersion == 2) && (GccMinorVersion >= 8)) +# define Gcc28Warnings -Wundef +# else +# define Gcc28Warnings /* */ +# endif +# endif +# ifndef GccWarningOptions +# if XFree86Devel +# define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations \ + -Wredundant-decls -Wnested-externs Gcc28Warnings +# else +# define GccWarningOptions -Wall -Wpointer-arith Gcc28Warnings +# endif +# endif +# ifndef DefaultCCOptions +# if defined(UseInstalled) +# define DefaultCCOptions /* -ansi */ +# else +# define DefaultCCOptions -ansi -pedantic GccWarningOptions +# endif +# endif +# if defined(UseInstalled) +# ifndef UseGccMakeDepend +# define UseGccMakeDepend YES +# endif +# endif +#endif + +/* Make imake noisier. Note that this is ineffective for 3.0 <= GCC <= 3.2 */ +#ifndef ImakeWarningFlags +# ifdef Gcc28Warnings +# define ImakeWarningFlags Gcc28Warnings +# else +# define ImakeWarningFlags /* */ +# endif +#endif + +#if (GccMajorVersion == 3) && (GccMinorVersion >= 1) +# define GccAliasingArgs -fno-strict-aliasing +#else +# define GccAliasingArgs /* */ +#endif + +#if HasGcc2 && defined(i386Architecture) +# ifndef DefaultGcc2i386Opt +# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs +# endif +#endif + +#if HasGcc2 && defined(AMD64Architecture) +# ifndef DefaultGcc2AMD64Opt +# define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs +# endif +#endif + +#if HasGcc2 && defined(AlphaArchitecture) +# ifndef DefaultGcc2AxpOpt +# define DefaultGcc2AxpOpt -O2 GccAliasingArgs +# endif +#endif + +#if HasGcc2 && defined(PpcArchitecture) +# ifndef DefaultGcc2PpcOpt +# define DefaultGcc2PpcOpt -O2 GccAliasingArgs +# endif +#endif + +#ifndef DefaultGcc2DebugOpt +# define DefaultGcc2DebugOpt -g +#endif + +#ifndef DebuggableLibraries +# define DebuggableLibraries NO +#endif + +#if HasGcc2 && DebuggableLibraries +# define LibraryDebugOpt DefaultGcc2DebugOpt +#endif + +/* + * Some versions of gcc have optimisation bugs that cause problems building + * some files. The definitions here cover those. + */ + +#ifndef Egcs112Bug + /* Not exactly precise, but it'll do for now... */ +# if HasGcc2 && defined(i386Architecture) && \ + (GccMajorVersion == 2) && (GccMinorVersion > 8) +# define Egcs112Bug YES +# else +# define Egcs112Bug NO +# endif +#endif + +#ifdef i386Architecture +# ifndef HasX86Support +# define HasX86Support YES +# endif +# ifndef HasMMXSupport +# define HasMMXSupport YES +# endif +# ifndef HasSSESupport +# define HasSSESupport NO +# endif +# ifndef Has3DNowSupport +# define Has3DNowSupport NO +# endif +#elif defined (AMD64Architecture) +# ifndef HasX86Support +# define HasX86Support NO +# endif +# ifndef HasMMXSupport +# define HasMMXSupport NO +# endif +# ifndef HasSSESupport +# define HasSSESupport NO +# endif +# ifndef Has3DNowSupport +# define Has3DNowSupport NO +# endif +#else +# ifndef HasX86Support +# define HasX86Support NO +# endif +# ifndef HasMMXSupport +# define HasMMXSupport NO +# endif +# ifndef HasSSESupport +# define HasSSESupport NO +# endif +# ifndef Has3DNowSupport +# define Has3DNowSupport NO +# endif +#endif + +#ifndef StaticNeedsPicForShared +# if defined (AMD64Architecture)\ + || defined (AlphaArchitecture) \ + || defined (ia64Architecture) \ + || defined (PpcArchitecture) \ + || defined (SparcArchitecture) \ + || defined (s390xArchitecture) +# define StaticNeedsPicForShared YES +# else +# define StaticNeedsPicForShared NO +# endif +#endif + +#ifndef XF8_32Wid +# define XF8_32Wid NO +#endif + +#if CrossCompiling +#include <cross.def> +#endif +#include <xf86.rules> + diff --git a/xorg.tmpl b/xorg.tmpl new file mode 100644 index 0000000..410c9a0 --- /dev/null +++ b/xorg.tmpl @@ -0,0 +1,151 @@ +XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XdotOrg: xc/config/cf/xorg.tmpl,v 1.1.2.3 2004/03/24 15:58:45 eich Exp $ + +#ifndef ConfigDefines +# define ConfigDefines -D__XCONFIGFILE__='"$(XCONFIGFILE)"' \ + -D__XCONFIGDIR__='"$(XCONFIGDIR)"' -D__XLOGFILE__='"$(XLOGFILE)"' \ + -D__XSERVERNAME__='"$(XSERVERNAME)"' +#endif + +CONFIG_DEFINES = ConfigDefines + +#ifndef ServerDefines +#define ServerDefines StandardDefines VersionDefines +#endif + +#ifdef BuilderEMailAddr +BUILDERADDR = BuilderEMailAddr +#else +BUILDERADDR = "xorg@freedesktop.org" +#endif +#ifdef VendorSupportAddress + VENDORSUPPORT = VendorSupportAddress + BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' -DVENDORSUPPORT='$(VENDORSUPPORT)' +#else + BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' +#endif + +#if defined(XF86DriverSDK) + BUILDMODULEDIR = $(DRIVERSDKMODULEDIR) + BUILDMODULETOP = .. + TOP_INCLUDES = TopIncludes + IMAKE_DEFINES = -DXF86DriverSDK=1 +#ifdef UseInstalled + IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ + $(IMAKE_DEFINES) $(IMAKE_WARNINGS) +#else + IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ + $(IMAKE_DEFINES) $(IMAKE_WARNINGS) +#endif + +#undef ImakeSubCmdHelper +#ifdef UseInstalled +#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \ + -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) +#else +#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \ + $(IMAKE_DEFINES) $(IMAKE_WARNINGS) \ + -I$(IMAKEPREFIX)$(IRULESRC) +#endif +#endif + +#ifndef JoystickSupport +#define JoystickSupport NO +#endif + +/* + * Module support: These overrides must be here, not in xf86.rules, + * because they will replace rules after having seen the first lines + * of Imakefile (include <Server.tmpl>) + */ + +#ifndef HasGccStackProtector +#define HasGccStackProtector NO +#endif + +#if HasGccStackProtector +MODULE_GCC_FLAGS1 = -fno-stack-protector +#endif + +#ifndef HasGccMergeConstants +#define HasGccMergeConstants NO +#endif + +#if HasGccMergeConstants && DoLoadableServer && !MakeDllModules +MODULE_GCC_FLAGS2 = -fno-merge-constants +#endif + +MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) + +#if defined(IHaveModules) && MakeDllModules +MODULE_PIC_FLAGS = $(PICFLAGS) +#endif + +MODULE_CFLAGS = $(MODULE_PIC_FLAGS) $(MODULE_GCC_FLAGS) + +#if defined(IHaveModules) +# if DoLoadableServer +MODULE_DEFINES = -DIN_MODULE -DXFree86Module +# else +MODULE_DEFINES = -DXFree86Module +# endif +#endif + +#if defined(IHaveModules) && DoLoadableServer + +/* This overrides the ObjCompile in Imake.rules! */ +#undef ObjectCompile +#define ObjectCompile(options) RemoveFile($@) @@\ + ClearmakeOSName\ + $(MODCC) $(MODCFLAGS) options -c $*.c + +/* This overrides an AssembleObject in xf86.rules or in an os-dependent + * rules file (currently only minix.cf and os2.rules (uncritical)) + */ +#define ModCPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ + $(MODCPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \ @@\ + grep -v '^\#' > basename.i + +#undef AssembleObject +#define AssembleObject(flags) ModCPPOnlyAsm($*,flags) @@\ + RemoveFile($*.o) @@\ + $(MODAS) $(MODASFLAGS) -o $*.o $*.i @@\ + RemoveFile($*.i) + +/* This overrides the NormalRelocatableTarget in Imake.rules */ +#undef NormalRelocatableTarget +#define NormalRelocatableTarget(objname,objlist) @@\ +AllTarget(objname.Osuf) @@\ + @@\ +objname.Osuf: objlist $(EXTRALIBRARYDEPS) @@\ + RemoveFile($@) @@\ + $(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@ + +/* This overrides the NormalDepRelocatableTarget in Imake.rules */ +#undef NormalDepRelocatableTarget +#define NormalDepRelocatableTarget(objname,deplist,objlist) @@\ +AllTarget(objname.Osuf) @@\ + @@\ +objname.Osuf: deplist $(EXTRALIBRARYDEPS) @@\ + RemoveFile($@) @@\ + $(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@ + +/* This overrides the RanLibrary in Imake.rules */ +#if DoRanlibCmd || NeedModuleRanlib +#undef RanLibrary +#define RanLibrary(args) $(MODRANLIB) args +#endif + +/* This overrides the MakeLibrary rule in Imake.rules */ +#undef MakeLibrary +#define MakeLibrary(libname,objlist) $(MODAR) libname objlist + +/* This overrides the LibraryTargetName rule in Imake.rules */ +#undef LibraryTargetName +#define LibraryTargetName(libname)Concat(lib,libname.a) + +/* This disables an OS/2 rule */ +#undef BuildLibSupportLibs +#define BuildLibSupportLibs(dummy) + +#endif /* IHaveModules */ diff --git a/xorgsite.def b/xorgsite.def new file mode 100644 index 0000000..4e3379d --- /dev/null +++ b/xorgsite.def @@ -0,0 +1,697 @@ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ +/******************************************************************************/ +/* + * This file is to provide a quick method for most people to change the + * behaviour of their XFree86 installation without having to fully + * understand the workings of site.def and all the various '.cf' files. + * + * In the vast majority of cases, it should not be necessary to use this + * file at all or change it in any way. + * + * This file is divided into two sections. The first contains settings + * that end-users might reasonably change. The second contains settings + * that developers might want to change. + * + * IMPORTANT NOTE: In all cases changing the defaults may cause problems + * and/or unexpected side-effects. If you don't understand what a setting + * does, then it's best to not change it. If you make changes and have + * problems, verify that those problems are also present when using an + * empty host.def file and unchanged version of this file before reporting + * them. + * + * A good way to use this file is to copy it to host.def, and make the + * changes there. That way, future patches to this file won't fail. + * The host.def file will never be patched. + * + * The distributed version of this file MUST contain no uncommented + * definitions. Default definitions belong in xfree86.cf, or <vendor>.cf + * files. + */ +/******************************************************************************/ + +/* + * If you have build-specific modifications in your host.def file, but + * want an empty host.def file installed when doing 'make install', + * uncomment the following + * +#define InstallEmptyHostDef + */ + +/* + * Which servers to build. There is only Xorg server. + * It can be disabled by the following. + * +#define XorgServer NO + */ + +/* + * To disable building the Xnest server, uncomment this. + * +#define XnestServer NO + */ + +/* + * To disable building Xvfb, uncomment this. + * +#define XVirtualFramebufferServer NO + */ + +/* + * To disable building Xprt, uncomment this. + * +#define XprtServer NO + */ + +/* + * Set the default server (ie the one that gets the sym-link to "X") + * +#define ServerToInstall XFree86 + */ + +/* + * If you only run the X server under xdm the X servers don't need to be + * installed SetUID, and you may comment out the lines below. If you run + * the servers by hand (with xinit or startx), then they do need to be + * installed SetUID on most platforms. + * + * Consult your system administrator before making the X server setuid. + * +#define InstallXserverSetUID NO + */ + + +/* + * Server configuration parameters. The defaults are shown here: + */ + +/* + * Which drivers to build. When building a static server, each of these + * will be included in it. When building the loadable server each of these + * modules will be built. + * +#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + GlideDriver fbdev i128 \ + ati AgpGartDrivers DevelDrivers ark cyrix \ + siliconmotion \ + vesa vga XF86OSCardDrivers XF86ExtraCardDrivers + */ + +/* + * To add third party drivers to the standard driver list, set the + * following. + * +#define XF86ExtraCardDrivers extradriver1 extradriver2 ... + */ + +/* + * Select the XInput devices you want by uncommenting this. + * +#define XInputDrivers mouse keyboard acecad calcomp citron \ + digitaledge dmc dynapro elographics \ + microtouch mutouch penmount spaceorb summa \ + wacom void magictouch aiptek + */ + +/* + * There are three parameters that determine where and how the Matrox HAL + * library is used: + * + * HaveMatroxHal -- You have the HALlib.a binary library installed + * in xfree86/drivers/mga/HALlib, and you want it to + * be used. + * Default: NO + * + * BuildMatroxHal -- You have the source for the HALlib library (installed + * in xfree86/drivers/mga/hallib), and want to build and + * use it. + * Default: NO + * + * UseMatroxHal -- You want to build support for loading/using the HAL + * library into the mga driver. For module server builds + * you don't need to have the HALlib library to do this. + * but you want to build support for loading it and using + * it into the mga driver module. + * Default: YES for loadable server build + * (HaveMatroxHal || BuildMatroxHal) for static + */ + +/* + * To disable use of the Matrox HAL library, uncomment this: + * +#define UseMatroxHal NO + */ + +/* + * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib, + * uncomment this: + * +#define HaveMatroxHal YES + */ + +/* + * If you have the HALlib source code installed in xfree86/drivers/mga/hallib, + * uncomment this: +#define BuildMatroxHal YES + */ + +/* + * To disable building the font server, uncomment this. + * +#define BuildFontServer NO + */ + +/* + * To disable support for Speedo fonts, uncomment this. + * +#define BuildSpeedo NO + */ + +/* + * To disable support for Type1 fonts, uncomment this. + * +#define BuildType1 NO + */ + +/* + * To disable support for CID fonts, uncomment this. + * +#define BuildCID NO + */ + +/* + * To disable support for TrueType fonts, uncomment these. + * +#define BuildFreeType NO +#define BuildXTrueType NO + */ + +/* + * To set non-default build options for the underlying FreeType libraries, + * add them here and uncomment. + * +#define Freetype2BuildDefines -DFREETYPE_BUILD_DEFINES + */ + +/* + * If you want to use FreeType 1.x build options that differ from the FreeType2 + * build options, set them here and uncomment. Otherwise the Freetype2 build + * options will be used for both FreeType 2.x and 1.x. Note: FreeType 1.x + * is currently only used for the X-TrueType (xtt) module. + * +#define Freetype1BuildDefines -DFREETYPE1_BUILD_DEFINES + */ + +/* + * To build the FreeType libraries with the TrueType byte code interpreter + * enabled, uncomment this. Note that there are patent issues related to the + * TrueType byte code interpreter, and we only recommend you enabling this + * if you are sure that there are no legal impediments to you doing so. See + * <http://www.freetype.org/patents.html> for further information. + * +#define Freetype2BuildDefines -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER + */ + +/* + * Do you want to Build Fonts (Usually you only want to build and install + * fonts once, if this is a first time install you will want to build the + * fonts) + * +#define BuildFonts NO + */ + +/* + * To not build/install the 75dpi fonts, uncomment the following + * +#define Build75DpiFonts NO + */ + +/* + * To not build/install the 100dpi fonts, uncomment the following + * +#define Build100DpiFonts NO + */ + +/* + * To not build/install the Speedo fonts, uncomment the following + * +#define BuildSpeedoFonts NO + */ + +/* + * To not build/install the Type1 fonts, uncomment the following + * +#define BuildType1Fonts NO + */ + +/* + * To not build/install the CID fonts, uncomment the following + * +#define BuildCIDFonts NO + */ + +/* + * To not build/install the True Type fonts, uncomment the following + * +#define BuildTrueTypeFonts NO + */ + +/* + * To not build/install the Cyrillic fonts, uncomment the following + * +#define BuildCyrillicFonts NO + */ + +/* + * To not install the local font directory, uncomment the following + * +#define MakeLocalFontDir NO + */ + +/* + * To build only the servers with a cut-down source tree, uncomment + * this. + * +#define BuildServersOnly YES + */ + +/* + * By default, the sample config files for xinit, xdm and xfs are installed + * only when there is no pre-existing version installed. Uncommenting the + * following lines will force the sample versions to be installed even if + * it means over-writing existing versions. + * +#define InstallXinitConfig YES +#define InstallXdmConfig YES +#define InstallFSConfig YES + */ + +/* + * By default the application defaults files are always installed. + * Uncommenting the the following will prevent exising application + * defaults files from being over-written. + * +#define InstallAppDefFiles NO + */ + +/* + * Undefine the following if you don't want to have config files and + * app-defaults installed in a separate directory (i.e. /etc/X11). + * +#define UseSeparateConfDir NO + */ + +/* + * To enable building the glide driver, you need to define + * HasGlide2 to YES and set the Glide2IncDir variable. + * HasGlide2 is per default NO. + * +#define HasGlide2 YES + */ + +/* + * Set the path to your Glide include files. + * +#define Glide2IncDir /usr/include/glide + */ + +/* + * Have glide 3? + * +#define HasGlide3 YES + */ + +/* + * Set the path to your Glide 3 include files. + * +#define Glide3IncDir /usr/include/glide3 + */ + + + +/* + * Unless you're a developer you shouldn't need to change anything + * beyond this point. + */ + +/* + * If you want to enable some developer settings, like more verbose + * compiler warnings, uncomment this. + * +#define XFree86Devel YES +*/ + +/* + * The default optimisation flags for GCC 2.x. -fno-strength-reduce is + * here to work around a bug in -O2 for GCC 2.x on i386 platforms. + * If you are using a version that doesn't have this bug, you can + * uncomment the following line, and remove '-fno-strength-reduce' + * If you are building binaries for a 486, it may be beneficial to add + * -m486 + * +#define DefaultGcc2i386Opt -O2 -fno-strength-reduce + */ + +/* + * This allows the GCC warning flags to be set. The default is shown here. + * +#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations \ + -Wredundant-decls -Wnested-externs + */ + +/* + * Sun Compiler stuff.. + * +#define HasSunC YES +#define HasSunCplusplus YES +#define CplusplusCompilerMajorVersion 5 +#define CplusplusCompilerMinorVersion 0 +#define CCompilerMajorVersion 5 +#define CCompilerMinorVersion 0 + */ + +/* + * Optimized Sun Compiler Build. + * +#define DefaultCDebugFlags -xO4 -xtarget=pentium_pro +#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro + */ + +/* + * Debuggable Sun Compiler Build. + * Note: This builds _EVERYTHING_ as debuggable + * +#define DefaultCDebugFlags -g -xs +#define OptimizedCDebugFlags -g -xs + */ + +/* + * For Linux, this should match the Binutils version you have. This example + * is for 2.6.0.7. See linux.cf for the default setting. + * + * This should automatically get set correctly by imake. + * +#define LinuxBinUtilsMajorVersion 26 + */ + +/* + * For Linux, these should match the libc version you have. This example + * is for libc.5.4.x. See linux.cf for the default setting. + * + * This should automatically get set correctly by imake. + * +#define LinuxCLibMajorVersion 5 +#define LinuxClibMinorVersion 4 + */ + +/* + * If you want to use the GNU malloc library, uncomment this + * +#define UseGnuMalloc YES + */ + +/* + * Set this to whatever is required to access the GNU malloc library. + * The default is '-lgmalloc' unless is specified in the OS's .cf file. + * +#define GnuMallocLibrary -L/usr/local/lib -lgmalloc + */ + +/* + * To enable the internal Xserver malloc, uncomment this + * +#define UseInternalMalloc YES + */ + +/* + * Some Linux releases don't have a libtermcap. In this case you may need + * to uncomment the following + * +#define TermcapLibrary -lncurses + */ + +/* + * Build a server that dynamically loads the modules by setting + * this to YES. This defaults to YES on most platforms. A static server + * can be built by setting this to NO. + * +#define DoLoadableServer NO + */ + +/* + * Build dlopen() style modules instead of the standard loader modules. + * Don't enable this unless you have specific development reasons for + * doing so and understand how to deal with the problems you'll run in to. + * + * Enabling this for regular use is NOT supported, and will almost + * certainly cause you problems. + * +#define MakeDllModules YES + */ + +/* + * Build XAA. This can be disabled with: + * +#define XF86XAA NO + */ + +/* + * Build vgahw. This can be disabled with: + * +#define XF86VgaHw NO + */ + +/* + * Build xf1bpp. This can be disabled with: + * +#define XF1Bpp NO + */ + +/* + * Build xf4bpp. This can be disabled with: + * +#define XF4Bpp NO + */ + + +/* + * BSD Console driver support (for FreeBSD and NetBSD). + * + * By default, support is included for pccons and pcvt for NetBSD, and + * pccons, syscons and pcvt for FreeBSD. + * + * To change the list of supported drivers, set the following parameter. + * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT. + * The following example includes support for syscons and pcvt only. + * +#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -DPCVT_SUPPORT + */ + +/* + * To link the X server with a dynamic version of the Xfont library, + * uncomment this. + * +#define XserverStaticFontLib NO + */ + +/* + * To enable binary compatibility with previous versions of the font + * encoding support, uncomment this. + * +#define FontencCompatibility YES + */ + +/* + * To disable building XInput support, uncomment this + * +#define BuildXInputExt NO + */ + +/* + * Uncomment this for joystick support. + * + * Note: Joystick support is broken, so don't enable this. + * +#define JoystickSupport YES + */ + +/* + * To disable the ScreenSaver Extension, uncomment this line. + * +#define BuildScreenSaverExt NO + */ + +/* + * If you don't want to build Xinerama support, uncomment this. + * +#define BuildXinerama NO + */ + +/* + * If you don't want to build support for the GLX extension, uncomment this. + * +#define BuildGlxExt NO + */ + +/* + * If you want to build the xf86rush extension, uncomment this line. + * This isn't recommended. + * +#define BuildXF86RushExt YES + */ + +/* + * If you want to build the client library for the xf86rush extension, + * uncomment this line. This isn't recommended. + * +#define BuildXF86RushLibrary NO + */ + +/* + * If you are running NetBSD 0.9C or later, and have the aperture driver + * installed, uncomment this. + * +#define HasNetBSDApertureDriver YES + */ + +/* + * If you are running SVR3 and have the mmap driver installed (for linear + * framebuffer access) uncomment this. + * +#define HasSVR3mmapDrv YES + */ + +/* + * If you are using an SVR3 (like ISC 4.x) which supports long file names, + * you can * uncomment this to have manual pages installed under their + * full names + * +#define ExpandManNames YES + */ + +/* + * For a POSIXized build on Interactive uncomment this + * Could be used with gcc 'till Version 2.6.3 + * Should be used with gcc 2.7.2. + * +#define UsePosix YES + */ + +/* + * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this. + * +#define HasXdmAuth YES + */ + +/* + * If you have Linux DECnet support, and want to build XFree86 with support + * for connections over DECnet, uncomment this. + * +#define HasDECnet YES + */ + +/* + * To build static and shared libraries with debugging information, uncomment + * this. Assumes you have Gcc2. + * (If you don't have Gcc2, you can use the DebugLib{X11,Xt,Xaw,...} variables + * to build debugging versions of the libraries separately.) + * +#define DebuggableLibraries YES +*/ + +/* + * To forceably build static libraries in addition to shared libraries, + * uncomment this. + * +#define ForceNormalLib YES + */ + +/* + * Uncomment this if your default tools (eg, gcc, ld, as, etc) are + * not the Linux ELF versions. + * +#define LinuxElfDefault NO + */ + +/* + * To use ELF format shared libraries for supported OSs, uncomment this. + * + * For Linux the default setting of this is the same as the setting of + * LinuxElfDefault. + * + * For FreeBSD this should automatically be set correctly by imake. Only + * change it here if you need to override the automatic setting. + * +#define UseElfFormat YES + */ + +/* + * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install + * a.out compatibility libraries. To enable that, uncomment this. + * +#define BuildAoutLibraries YES + */ + +/* + * If you have trouble with make bombing out in Xlib, try uncommenting this. + * You will not get dependencies as a result, but better than nothing. + * +#define MakeHashTableBug YES + */ + +/* + * If you do not want your man pages compress under SVR3 systems that + * support it, uncomment this. + * +#define CompressManPages NO + */ + +/* + * If you have sgmlfmt (the XFree86 doctools package) and want to build + * formatted docs from the SGML source, uncomment this. + * +#define HasSgmlFmt YES + */ + +/* + * To disable building some document formats, uncomment some of these. + * +#define BuildLinuxDocText NO +#define BuildLinuxDocHtml NO +#define BuildLinuxDocPS NO + */ + +/* + * To install Japanese versions of the documentation uncomment this. + * Note: The Japanese documentation consists of a subset of the + * XFree86 3.1 docs. + * +#define InstallJapaneseDocs YES + */ + +/* + * To build/install X specs docs, uncomment the following. + * The SpecsDocDirs setting here is recommended because it covers + * the docs that XFree86 has changed or added. + * +#define BuildSpecsDocs YES +#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n xterm + */ + +/* + * To build all specs docs, not just those listed in SpecsDocDirs, uncomment + * the following. + * +#define BuildAllSpecsDocs YES + */ + +/* + * If your system doesn't support vm86() mode and you have + * libx86emu set library path here + * +#define X86EMU_LIBPATH /usr/local/lib + */ + + |