diff options
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/config/Imakefile | 6 | ||||
| -rw-r--r-- | nx-X11/config/cf/Imakefile | 7 | ||||
| -rw-r--r-- | nx-X11/config/cf/Server.tmpl | 4 | ||||
| -rw-r--r-- | nx-X11/config/cf/xf86.tmpl | 128 | ||||
| -rw-r--r-- | nx-X11/config/cf/xf86site.def | 479 | ||||
| -rw-r--r-- | nx-X11/config/cf/xfree86.cf | 1770 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/X/Imakefile | 9 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/Imakefile | 2 |
12 files changed, 11 insertions, 2404 deletions
diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile index 5c95a5d80..03b9f5b94 100644 --- a/nx-X11/config/Imakefile +++ b/nx-X11/config/Imakefile @@ -15,16 +15,14 @@ BOOTSTRAPSUBDIRS = \ SUBDIRS = cf $(BOOTSTRAPSUBDIRS) -#if (defined(XFree86VersionString) || defined(XorgVersionString)) \ +#if defined(XorgVersionString) \ && defined(ProjectRoot) && \ defined(BuildBindist) all:: version version: cf/version.def RemoveFile(version) -#if defined (XFree86VersionString) - echo XFree86VersionString > version -#elif defined (XorgVersionString) +#if defined (XorgVersionString) echo XorgVersionString > version #endif diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile index 20374d6db..b7626590d 100644 --- a/nx-X11/config/cf/Imakefile +++ b/nx-X11/config/cf/Imakefile @@ -15,14 +15,13 @@ HOSTDEFFILES = \ host.def #endif -#if defined(XFree86Version) || defined(XorgVersion) +#if defined(XorgVersion) VERSIONDEFFILES = \ date.def \ version.def #endif DEFFILES = \ -xf86site.def \ xorgsite.def \ $(VERSIONDEFFILES) \ $(HOSTDEFFILES) \ @@ -45,13 +44,11 @@ ServerLib.tmpl \ Threads.tmpl \ X11.tmpl \ lnxLib.tmpl \ -xf86.tmpl \ xorg.tmpl CFFILES = \ Imake.cf \ linux.cf \ -xfree86.cf \ xorg.cf INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) @@ -73,7 +70,7 @@ install:: $(DESTDIR)$(CONFIGDIR)/host.def; \ RemoveFile($${TMP})) -#if defined(XFree86Version) || defined(XorgVersion) +#if defined(XorgVersion) install.sdk:: @(TMP=/tmp/tmp.$$$$; \ RemoveFile($${TMP}); \ diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl index bb769c5be..3ada3087b 100644 --- a/nx-X11/config/cf/Server.tmpl +++ b/nx-X11/config/cf/Server.tmpl @@ -70,10 +70,6 @@ GLX_DEFINES = GlxDefines #define GlxUseSGISI NO #endif -#ifdef XFree86Version -#include <xf86.tmpl> -#endif - #ifdef XorgVersion #include <xorg.tmpl> #endif diff --git a/nx-X11/config/cf/xf86.tmpl b/nx-X11/config/cf/xf86.tmpl deleted file mode 100644 index ba352445e..000000000 --- a/nx-X11/config/cf/xf86.tmpl +++ /dev/null @@ -1,128 +0,0 @@ -XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.32 2002/11/14 21:01:14 tsi Exp $ - -#ifdef BuilderEMailAddr -BUILDERADDR = BuilderEMailAddr -#else -BUILDERADDR = "xorg@freedesktop.org" -#endif -BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' - -#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 HasGccMergeConstants -#define HasGccMergeConstants NO -#endif - -#if HasGccMergeConstants && DoLoadableServer && !MakeDllModules -MODULE_GCC_FLAGS = -fno-merge-constants -#endif - -#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(basename,flags) ModCPPOnlyAsm(basename,flags) @@\ - RemoveFile(basename.o) @@\ - $(MODAS) $(MODASFLAGS) -o basename.o basename.i @@\ - RemoveFile(basename.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/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def deleted file mode 100644 index 6f0961252..000000000 --- a/nx-X11/config/cf/xf86site.def +++ /dev/null @@ -1,479 +0,0 @@ -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 now only one XFree86 server. - * It can be disabled by the following. - * -#define XF86Server NO - */ - -/* - * Set the default server (ie the one that gets the sym-link to "X") - * -#define ServerToInstall XFree86 - */ - -/* - * 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 - */ - -/* - * To build only the servers with a cut-down source tree, uncomment - * this. - * -#define BuildServersOnly YES - */ - -/* - * 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 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,...} 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 - */ - -/* - * 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 - */ - - diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf deleted file mode 100644 index 9065ce68c..000000000 --- a/nx-X11/config/cf/xfree86.cf +++ /dev/null @@ -1,1770 +0,0 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.466 2004/01/11 18:48:11 dawes Exp $ -/* - * This configuration file contains all of the configuration - * information for the XFree86 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 "version.def" -#include "date.def" -/* - * As of the development trunk after 4.0.2, XFree86 versions are - * M.m.P.s, and XFree86Version is: - * - * M * 10000000 + m * 100000 + P * 1000 + s - * - * See xc/programs/Xserver/hw/xfree86/doc/Versions for further details. - * - * From 3.9.15 to 4.0.x, XFree86 release versions are X.Y.Z, and - * XFree86Version is: - * - * X * 1000 + Y * 100 + Z - * - * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version - * calculated as: - * - * X * 1000 + Y * 100 + Z * 10 + W - * - */ -#ifndef XFree86Version -# ifdef XF86_VERSION_CURRENT -# define XFree86Version XF86_VERSION_CURRENT -# else /* Must be defined for bootstrapping purposes */ -# define XFree86Version 0 -# endif -#endif - -#if !defined(XFree86VersionString) && \ - defined(XF86_VERSION_MAJOR) && defined(XF86_VERSION_MINOR) && \ - defined(XF86_VERSION_PATCH) && defined(XF86_VERSION_SNAP) -# if XF86_VERSION_SNAP == 0 -#define XFree86VersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH | sed 's/ /./g'` -#else -#define XFree86VersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH XF86_VERSION_SNAP | sed 's/ /./g'` -# endif -#endif - -#if !defined(XFree86ManVersionString) && \ - defined(XF86_VERSION_MAJOR) && defined(XF86_VERSION_MINOR) && \ - defined(XF86_VERSION_PATCH) && defined(XF86_VERSION_SNAP) -# if XF86_VERSION_SNAP == 0 -#define XFree86ManVersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -#else -#define XFree86ManVersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH XF86_VERSION_SNAP | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -# endif -#endif - -#if !defined(XFree86DateString) && defined(XF86_DATE) -# define XFree86DateString XF86_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) | \ @@\ - fgrep '$$XFree86:' >/dev/null 2>&1; then \ @@\ - tail $(CHANGELOGFILE) | fgrep '$$XFree86:' | \ @@\ - 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, Inc" -#endif - -#ifndef XVendorRelease -# define XVendorRelease XFree86Version -#endif - -#ifndef XVendorManVersionString -#define XVendorManVersionString XFree86ManVersionString -#endif - -#ifndef XVendorManNameString -#define XVendorManNameString XFree86 -#endif - -/* - * This enables some settings for developers. - */ - -#ifndef XFree86Devel -# if !defined(PatheticCpp) || !PatheticCpp -# if (XFree86Version % 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 XF86Config -#endif -#ifndef XConfigDir -#define XConfigDir $(LIBDIR) -#endif -#ifndef XLogFile -#define XLogFile XFree86 -#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 -#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 - -/* - * For Intel platforms, the default is to build all modules which - * are supported on this platform. - */ -#if defined(i386Architecture) || defined(ia64Architecture) -# ifndef XF86Server -# define XF86Server 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 -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA 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 - -#if defined(AMD64Architecture) -# ifndef XF86Server -# define XF86Server 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 -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA 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 - -#endif /*AMD64Arcitecture*/ - -/* SPARC and UltraSPARC drivers */ - -#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ - !defined(LynxOSArchitecture) && \ - !defined(NetBSDArchitecture) && \ - !defined(OpenBSDArchitecture) -# ifndef XF86Server -# define XF86Server 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 -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA 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 -#endif - -/* Sparc64 Drivers */ -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -# ifndef XF86Server -# define XF86Server 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 -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA 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 -#endif - -/* MIPS drivers */ - -#ifdef MipsArchitecture -# ifndef XF86Server -# define XF86Server 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 -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA 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 XF86Server -# define XF86Server 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 -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA 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 -#endif - -/* - * Motorola 68k and PowerPC drivers - */ -#if defined(PpcArchitecture) || defined(Mc68020Architecture) -# ifndef XF86Server -# define XF86Server 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 -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA 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 -#endif - -/* - * Intel StrongARM and Hewlett-Packard PA-RISC - */ -#if defined(Arm32Architecture) || defined(HPArchitecture) -# ifndef XF86Server -# define XF86Server 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 -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA 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 -#endif - -/* SuperH drivers */ - -#if defined(SuperHArchitecture) -# ifndef XF86Server -# define XF86Server 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 -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA 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 PowerPC 64bit systems - * only libraries are strictly needed - */ -#if defined(Ppc64Architecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp NO -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp NO -# 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 NO -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA 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 DevelDrivers -# if XFree86Devel -# define DevelDrivers -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif - -/* - * For Mips/Arc platforms, the default is to build all modules which - * are supported on this platform. - */ -#ifdef ArcArchitecture -# ifndef XF86Server -# define XF86Server YES -# endif -#endif - -#if BuildDebug -# define DebugDefines -DBUILDDEBUG -#else -# define DebugDefines /**/ -#endif - -#ifndef XF86Server -# define XF86Server NO -#endif -#if !XF86Server -# 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 - -/* - * Build GLX server interface - * --- Doesn't work for 1-bit and 4-bit servers - */ -#ifndef BuildGlxExt -# define BuildGlxExt YES -#endif - -#if BuildGlxExt - -# define GlxCoreLibDefines -DGLX_USE_MESA - -# 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 GlxCoreLibDefines GlxArchDefines -# 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 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 BuildXF86MiscLibrary -# define BuildXF86MiscLibrary YES -#endif -#ifndef BuildXF86DGALibrary -# define BuildXF86DGALibrary YES -#endif -#ifndef BuildXF86VidModeLibrary -# define BuildXF86VidModeLibrary 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 - -/* - * 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) || \ - (defined(KFreeBSDArchitecture) && defined(i386Architecture)) -# define BuildScanpci YES -# else -# define BuildScanpci NO -# endif -#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) -#endif - -#ifndef XFree86ServerOSDefines -# define XFree86ServerOSDefines -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \ - -DDDXOSVERRORF -#endif - -#ifndef XFree86ConsoleDefines -# if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) || (defined(KFreeBSDArchitecture) && defined(i386Architecture)) -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT -# elif defined(KFreeBSDArchitecture) -# 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 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 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(Ppc64Architecture) -# ifndef DefaultGcc2Ppc64Opt -# define DefaultGcc2Ppc64Opt -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/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 05b82f885..43a925d7a 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -1140,7 +1140,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese */ #ifndef OtherIConfigFiles -# define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules +# define OtherIConfigFiles $(IRULESRC)/xf86.rules #endif #ifndef UseRgbTxt diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile index deae53bb3..e676af941 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $ +XCOMM $Free86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer #define IHaveModules @@ -21,13 +21,6 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) COMMON_SRCS = driverfuncs.c COMMON_OBJS = driverfuncs.o -#ifndef XFree86Version - -/* This appears to be the quickest way to build a non-XFree86 server */ -GLXSRV_DEFINES = -DXFree86Server - -#endif - GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 5ddfb9b5e..43d49d085 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -34,7 +34,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey #define dependLib(x) #endif -#if (defined (XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* Do not strip server binaries */ INSTPGMFLAGS = #endif @@ -89,7 +89,7 @@ INSTPGMFLAGS = #if BuildXKB XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS)) XKBDIR = xkb -#if (defined(XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o #endif #endif diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index f44edb172..174026c3e 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -157,7 +157,7 @@ NX_DEFINES = -DNXAGENT_SERVER #endif -#if (defined(XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* XXX Check if this can be eliminated */ XF86INCLUDES = -I$(XF86COMSRC) #endif diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 210067635..d68ef940c 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 HEADERS = os.h misc.h -#if defined(XorgVersion) || defined(XFree86Version) \ +#if defined(XorgVersion) \ || defined(BSDOSArchitecture) #if DoLoadableServer LinkSourceFile(xf86Module.h,$(XF86COMSRC)) diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 24caa0299..e62fb0005 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/nx-X11/programs/Xserver/mi/Imakefile @@ -62,7 +62,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ micmap.o mioverlay.o -#if (defined (XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o * used by Xnest, Xvfb |