nx-X11 vs. X.Org 6.9 patches for further studying / documentation

  NoMachine kept all original X.Org 6.9 files in the nx-X11 source
  tree. These files have been removed in Feb 2015 during a major
  code cleanup.

  For later studying we provide all diffs of the changes that
  NoMachine employed on the original X.Org X11 code tree in the
  doc/nx-X11_vs_XOrg69_patches folder.

1 files changed, 1023 insertions, 0 deletions

diff --git a/doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch b/doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch
new file mode 100644
index 000000000..f3454e760
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch
@@ -0,0 +1,1023 @@
+--- ./nx-X11/config/cf/host.def.X.original	2015-02-13 14:03:44.400448260 +0100
++++ ./nx-X11/config/cf/host.def	2015-02-13 14:03:44.400448260 +0100
+@@ -0,0 +1,1020 @@
++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 Xorg 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 xorg.cf, or <vendor>.cf
++ * files.
++ */
++/******************************************************************************/
++
++/**************************************************************************/
++/*                                                                        */
++/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
++/*                                                                        */
++/* NX-X11, NX protocol compression and NX extensions to this software     */
++/* are copyright of NoMachine. Redistribution and use of the present      */
++/* software is allowed according to terms specified in the file LICENSE   */
++/* which comes in the source distribution.                                */
++/*                                                                        */
++/* Check http://www.nomachine.com/licensing.html for applicability.       */
++/*                                                                        */
++/* NX and NoMachine are trademarks of Medialogic S.p.A.                   */
++/*                                                                        */
++/* All rights reserved.                                                   */
++/*                                                                        */
++/**************************************************************************/
++
++#if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture)
++
++#if defined(SunArchitecture)
++#define ProjectRoot /usr/openwin
++#endif
++
++/*
++ * Enable use the Cygwin IPC libraries to get MIT-SHM support.
++ */
++#if defined(cygwinArchitecture)
++#define UseCygIPC	YES
++#endif
++
++/*
++ * 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
++ */
++#define XorgServer		NO
++
++/*
++ * To disable building the Xnest server, uncomment this.
++ *
++#define XnestServer		NO
++ */
++#define XnestServer		NO
++
++/*
++ * To disable building Xvfb, uncomment this.
++ *
++#define XVirtualFramebufferServer	NO
++ */
++#define XVirtualFramebufferServer	NO
++
++/*
++ * To enable building Xdmx, uncomment this.
++ *
++#define XdmxServer YES
++ */
++#define XdmxServer NO
++
++/*
++ * To disable building Xprt, uncomment this.
++ *
++#define XprtServer NO
++ */
++#define XprtServer NO
++
++/*
++ * Xprint is needed by Xprt. You can disable it if
++ * you are not going to build Xprt.
++ *
++#define BuildXprint		NO
++ */
++#define BuildXprint		NO
++
++/*
++ * Building libraries with NX enhancements is disabled
++ * by default. You should enable this in your host.def.
++ *
++#define NXLibraries		YES
++ */
++#define NXLibraries		YES
++
++/*
++ * Building the NX agent nested server is disabled
++ * by default. Enable this in your host.def.
++ *
++#define NXAgentServer		YES
++ */
++#define NXAgentServer		YES
++
++/*
++ * Assume the new build tree.
++ *
++#define NXUpgradeAgentServer	NO
++ */
++#define NXUpgradeAgentServer	YES
++
++#ifdef NXAgentServer
++#define BuildRenderLibrary	YES
++#define SharedLibFreetype2	YES
++#define NormalLibFreetype2	YES
++#define FontLibSharedFreeType 	NO
++#endif
++
++/*
++ * Define this symbol to build the NX enhanced MS Windows
++ * X server for Cygnus environment.
++ *
++#define NXWinServer		YES
++ */
++#if defined(cygwinArchitecture)
++#define NXWinServer             NO
++#define XWinServer              NO
++#endif
++
++/*
++ * Set the default server (ie the one that gets the sym-link to "X")
++ *
++#define ServerToInstall		Xorg
++ */
++
++/*
++ * Force build of X libraries if any nested server is to be built.
++ *
++#define BuildLibraries			YES
++ *
++ * If you just want libraries for NXAgentServer, this should be
++ * enough (never tested, although).
++ *
++#define BuildLibrariesForXServers	YES
++ */
++#if XnestServer || NXAgentServer
++#define BuildLibraries			YES
++#endif
++
++#define BuildDamageLibrary              YES
++
++#define BuildXfixesLibrary              YES
++
++#define BuildCompositeLibrary           YES
++
++#define BuildRandRLibrary               YES
++
++#define BuildDocs                       NO
++
++#define BuildComposite			YES
++
++/*
++ * 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 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 enable building of development DRI drivers (insecure, or not
++ * useful on the chosen architecture, uncomment this define.
++#define BuildDevelDRIDrivers YES
++ */
++
++/*
++ * To use the deprecated, old keyboard driver, uncomment this.  But
++ * even better, make the new keyboard driver (hw/xfree86/input/keyboard)
++ * work for your architechture.  The old driver will be removed in the
++ * next release.
++ *
++#define UseDeprecatedKeyboardDriver YES
++ */
++
++/*
++ * 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
++ */
++#define BuildFontServer		NO
++
++/*
++ * Speedo fonts have been disabled by default in this release.
++ * To re-enable support for Speedo fonts, uncomment this.
++ *
++#define BuildSpeedo		YES
++ */
++
++/*
++ * To disable support for CID fonts, uncomment this.
++ *
++#define BuildCID		NO
++ */
++
++/*
++ * To disable support for TrueType fonts, uncomment these.
++ *
++#define BuildFreeType		NO
++ */
++
++/*
++ * To set non-default build options for the underlying FreeType libraries,
++ * add them here and uncomment.
++ *
++#define Freetype2BuildDefines	-DFREETYPE_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
++ */
++#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 build/install the Speedo fonts, uncomment the following
++ * (see setting above about Speedo support as well)
++ *
++#define BuildSpeedoFonts	YES
++ */
++
++/*
++ * 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
++ */
++
++/*
++ * Include True Type Fonts to default font path. It is safe to do
++ * this by default as NX intaller carries only misc and TTF in the
++ * basic set of fonts installed under Windows.
++ *
++#define DefaultFontPath		$(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
++ */
++
++#if defined(LinuxArchitecture) || defined(SunArchitecture) || defined(FreeBSDArchitecture)
++#define DefaultFontPath		$(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/,$(FONTDIR)/TTF/
++#endif /* #if defined(LinuxArchitecture) || defined(SunArchitecture) */
++
++#if defined(cygwinArchitecture)
++#define DefaultFontPath		/mnt/NX/fonts/base/,/mnt/NX/fonts/misc/,/mnt/NX/fonts/Speedo/,/mnt/NX/fonts/Type1/,/mnt/NX/fonts/75dpi/,/mnt/NX/fonts/100dpi/,/mnt/NX/fonts/TTF/
++#define DefaultRGBDatabase      /mnt/NX/fonts/rgb
++#endif /* #if defined(cygwinArchitecture) */
++
++/*
++ * To build only the servers with a cut-down source tree, uncomment
++ * this.
++ *
++#define BuildServersOnly	YES
++ */
++#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
++*/
++
++/*
++ * If using GCC 2.x on a system where it isn't the default, uncomment
++ * the following
++ *
++ */
++#if defined(SunArchitecture)
++#define HasGcc2		YES
++#define HasGcc		YES
++#endif
++
++/*
++ * 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
++ */
++
++#if defined (LinuxArchitecture)
++#define DefaultGcc2i386Opt      -g -O3
++#endif
++
++/*
++ * Enable all the optimizations on AMD64.
++ */
++
++#define DefaultGcc2AMD64Opt	-g -O3 GccAliasingArgs
++
++/*
++ * 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
++ */
++
++/*
++ * This release defaults to building dlopen() style modules instead of the 
++ * previously standard loader modules.
++ * 
++ * Uncomment the following to return to the XFree86 custom loader modules.
++ *
++#define MakeDllModules		NO
++ */
++
++/*
++ * 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
++ */
++#if defined(SunArchitecture)
++#define BuildXInputExt		YES
++#endif
++
++/*
++ * 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
++ */
++#define BuildScreenSaverExt	NO
++
++/* 
++ * If you don't want to build Xinerama support, uncomment this.
++ *
++#define BuildXinerama		NO
++ */
++#define BuildXinerama		NO
++
++/*
++ * If you don't want to build support for the GLX extension, uncomment this.
++ *
++#define BuildGlxExt             NO
++ */
++#define BuildGlxExt             YES
++
++/*
++ * Taken from xorg.cf.
++ */
++
++#if defined(SparcArchitecture)  \
++   || defined (Sparc64Architecture) \
++   || defined(ia64Architecture) \
++   || defined(s390xArchitecture) \
++   || defined(AMD64Architecture)
++#define GlxExtraDefines -D__GLX_ALIGN64
++#endif
++
++/*
++ * If you want to build the xf86rush extension, uncomment this line.
++ * This isn't recommended.
++ *
++#define BuildXF86RushExt	YES
++ */
++#define BuildXF86RushExt	NO
++
++/*
++ * If you want to build the client library for the xf86rush extension,
++ * uncomment this line.  This isn't recommended.
++ *
++#define BuildXF86RushLibrary	NO
++ */
++#define BuildXF86RushLibrary	NO
++
++/*
++ * We should never need LBX in a NX enabled environment...
++ *
++#define BuildLBX		NO
++ */
++#define BuildLBX		NO
++
++#define BuildXKB		YES
++#define BuildXKBlib		YES
++
++#define SharedLibXau		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 don't want XDMAUTH support (if you don't have Wraphelp.c), 
++ *  comment this out.
++ *
++ */
++#if defined(LinuxArchitecture)
++#define HasXdmAuth		YES
++#endif /* #if defined(LinuxArchitecture) */
++
++/*
++ * 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
++*/
++#if defined(LinuxArchitecture)
++#define DebuggableLibraries	YES
++#endif /* #if defined(LinuxArchitecture) */
++/*
++ * 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
++ */ 
++
++/*
++ * Most platforms default to using an already installed FreeType 2 library.
++ * To use the one included in this release instead, uncomment the following.
++ *
++#define HasFreetype2 NO
++ */
++#define HasFreetype2 NO
++
++/* 
++ * To use a FreeType library already installed outside the default search
++ * paths, uncomment the following and set the path as needed.
++ *
++#define HasFreetype2 YES
++#define Freetype2Dir /usr/local
++ */
++
++
++/*
++ * Most platforms default to using an already installed Fontconfig library.
++ * To use the one included in this release instead, uncomment the following.
++ *
++#define HasFontconfig NO
++ */
++#define HasFontconfig NO
++
++/* 
++ * To use a Fontconfig library already installed outside the default search
++ * paths, uncomment the following and set the path as needed.
++#define HasFontconfig YES
++#define FontconfigDir /usr/local
++ */
++
++
++/*
++ * Most platforms default to using an already installed Expat library.
++ * To use the one included in this release instead, uncomment the following.
++ *
++#define HasExpat NO
++ */
++#define HasExpat NO
++
++/* 
++ * To use a Expat library already installed outside the default search
++ * paths, uncomment the following and set the path as needed.
++#define HasExpat YES
++#define ExpatDir /usr/local
++ */
++
++
++/*
++ * Most platforms default to using an already installed PNG library.
++ * To use the one included in this release instead, uncomment the following.
++ *
++#define HasLibpng NO
++ */
++
++/* 
++ * To use a PNG library already installed outside the default search
++ * paths, uncomment the following and set the path as needed.
++#define HasLibpng YES
++#define LibpngDir /usr/local
++ */
++
++
++/*
++ * Most platforms default to using an already installed xterm program.
++ * To use the one included in this release instead, uncomment the following.
++ *
++#define BuildXterm YES
++ */
++
++#define SharedLibXau           NO
++
++#define SharedLibXdmcp         NO
++
++#define BuildXaw7              YES
++
++#else /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */
++
++#if defined(DarwinArchitecture) && !defined(NXZaurusXServer) && !defined(NXiPAQXServer)
++#define NXDarwinServer              NO
++#define BuildServersOnly            YES
++#define DefaultFontPath             /usr/NX/share/fonts/misc/,/usr/NX/share/fonts/TTF/
++#define DefaultRGBDatabase          /usr/NX/share/rgb
++#define XprtServer                  NO
++#define BuildXprint                 NO
++#define XnestServer                 NO
++#define XVirtualFramebufferServer   NO
++#define BuildFontServer             NO
++#define BuildFreeType               NO
++#define BuildXTrueType              NO
++#define FontLibSharedFreeType       NO
++#endif
++
++#if !defined(NXZaurusXServer) && defined(NXiPAQXServer)
++#define KDriveXServer               YES
++#define XiPAQH3500Server            YES
++#define BuildServersOnly            YES
++#define NXEmbeddedXServer           YES
++#define KdriveServerExtraDefines    -DITSY -DMAXSCREENS=1
++#define TinyXServer                 YES
++#define CrossCompiling              YES
++#define TouchScreen                 YES
++#define ItsyCompilerBug             YES
++#undef  BuildRandR
++#define BuildRandR                  YES
++#define BuildXInputLib              YES
++#define BuildXTrueType              YES
++#define ServerXdmcpDefines
++#define XipaqServer                 YES
++#endif
++
++#if !defined(NXiPAQXServer) && defined(NXZaurusXServer)
++#define KDriveXServer               YES
++#define XiPAQH3500Server            YES
++#define BuildServersOnly            YES
++#define ZaurusXServer               YES
++#define NXEmbeddedXServer           YES
++#define KdriveServerExtraDefines    -DITSY -DMAXSCREENS=1
++#define TinyXServer                 YES
++#define CrossCompiling              YES
++#define TouchScreen                 YES
++#define ItsyCompilerBug             YES
++#undef  BuildRandR
++#define BuildRandR                  YES
++#define BuildXInputLib              YES
++#define BuildXTrueType              YES
++#define ServerXdmcpDefines
++#define XipaqServer                 YES
++#define XfbdevServer                YES
++#endif
++
++#endif /* #if !defined(NXZaurusXServer) && !defined(NXiPAQXServer) && !defined(DarwinArchitecture) */