Commit 3033c9bf authored by kem's avatar kem
Browse files

Import of XFree86 3.9.18

parent aaf0250c
XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04:42 rws $
XCOMM $XFree86: xc/config/Imakefile,v 1.2 2000/02/13 00:12:18 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......@@ -6,7 +7,10 @@ XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04:42 rws $
#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
BOOTSTRAPSUBDIRS = imake makedepend
SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util
#if BuildDPSLibrary
PSWRAPDIR = pswrap
#endif
SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util $(PSWRAPDIR)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
......@@ -2,7 +2,7 @@ XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $
XCOMM
XCOMM
XCOMM
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.85 1999/05/22 08:39:55 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.91 2000/02/15 13:51:38 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -52,6 +52,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasWChar32 YES
#define HasUsableFileMmap YES
#define HasNCurses YES
#define HasVarRun YES
#define HasVarDb YES
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
......@@ -68,8 +70,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define MkdirHierCmd mkdir -p
#ifndef LexCmd
#define LexCmd flex -l
#endif
#define CcCmd cc
#define CppCmd /usr/libexec/cpp
#define CppCmd /usr/bin/cpp
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
......@@ -300,7 +306,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define AsmDefines AsmElfDefines
#endif
#ifdef i386Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines
#endif
#ifdef AlphaArchitecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif
#define StandardDefines -DCSRG_BASED
......@@ -332,7 +343,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifdef i386Architecture
# define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
# define OptimizedCDebugFlags -O2
# define OptimizedCDebugFlags -O
#endif
#ifndef PreIncDir
......@@ -395,8 +406,8 @@ install.man:: list @@\
MakeDir($(DESTDIR)dest) @@\
@case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
for i in list; do \ @@\
(set -x; \ @@\
MNAME=`echo $$i | cut -f1 -d.`; \ @@\
(MNAME=`echo $$i | cut -f1 -d.`; \ @@\
set -x; \ @@\
$(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\
$(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\
$(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
......@@ -441,8 +452,22 @@ install.man:: @@\
#define DlLibrary /**/
#endif
#ifdef AlphaArchitecture
#define IoLibrary -lio
#else
#define IoLibrary /**/
#endif
#define ServerExtraSysLibs IoLibrary
/*
* A hack to work around an optimisation problem with the compiler on
* FreeBSD 4.0-current in late 1999/early 2000.
*/
#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0
#define FreeBSDGccOptBug
#endif
#include <bsdLib.rules>
#ifdef i386Architecture
#include <xfree86.cf>
#endif
......@@ -17,7 +17,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.51 1999/12/27 00:39:15 robin Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
#if defined(clipper) || defined(__clipper__)
# undef clipper
......@@ -162,6 +162,11 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.51 1999/12/27 00:39:15 robin Exp $
# define i386Architecture
# undef i386
# endif
# ifdef __alpha__
# define AlphaBsdArchitecture
# define AlphaArchitecture
# undef __alpha__
# endif
#endif /* __FreeBSD__ */
#ifdef AMOEBA
......@@ -723,6 +728,26 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.51 1999/12/27 00:39:15 robin Exp $
#define i386Architecture
#endif /* QNX4 */
#ifdef __QNXNTO__
#define MacroIncludeFile <nto.cf>
#define MacroFile nto.cf
#define NTOArchitecture
#ifdef PPC
# define PPCArchitecture
# undef PPC
#else
#ifdef MIPS
# define mipsArchitecture
# undef MIPS
#else
#ifdef i386
# define i386Architecture
# undef i386
#endif
#endif
#endif
#endif /* QNX/Neutrino */
#ifndef MacroIncludeFile
XCOMM WARNING: Imake.cf not configured; guessing at definitions!!!
XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.62 1999/10/13 16:49:01 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.64 2000/02/13 06:15:16 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -85,6 +85,10 @@ XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.62 1999/10/13 16:49:01 dawe
* InstallNamedProgNoClobber (srcname,dstname,dest)
* MakeFlagsToShellFlags (makeflags,shellcmd)
* MakeNamedTargetSubdir (dir,flags,subname)
* LinkConfDirectoryLong (mdir,cdir,rdir,ldir,opath,npath)
* LinkConfDirectory (mdir,cdir,rdir,ldir)
* LinkConfFileLong (cfile,lfile,opath,npath)
* LinkConfFile (cfile,lfile)
* LinkFileList (step,list,dir,sub)
* LinkVarDirectory (mdir,cdir,rdir,ldir)
* InstallMultipleDestFlags (step,list,dest,flags)
......@@ -1409,44 +1413,96 @@ step:: list @@\
for i in list; do (set -x; RemoveFile($$i); $(LN) sub/$$i .); done
#endif
/*
* LinkVarDirectory
* LinkConfDirectoryLong
*
* Make links from $LIBDIR (<ProjectRoot>/lib/X11) to /var/X11/
* For example /usr/X11R6/lib/X11/xdm ==> /var/X11/xdm so that X
* Make links from opath (usually <ProjectRoot>/lib/X11) to npath
* For example /usr/X11R6/lib/X11/xdm ==> /etc/X11/xdm so that X
* binaries can be mounted from a read-only volume like a CD-ROM;
* but files that may need to be edited can be stored locally on
* read-write media. If someone has an existing installation, be
* careful and move existing files to the new location in /var.
* careful and move existing files to the new location in /etc.
* XXX Need to make the installation script do this when installing
* binary distributions.
*
* Since the link is used in the installation process, we need to
* make the link relative in order to honor $(DESTDIR) if it is set.
*/
#ifndef LinkVarDirectory
#if HasVarDirectory && HasSymLinks
#define LinkVarDirectory(mdir,cdir,rdir,ldir) @@\
#ifndef LinkConfDirectoryLong
#if UseSeparateConfDir && HasSymLinks
#define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath) @@\
install:: @@\
MakeDir(Concat($(DESTDIR)$(LIBDIR)/,cdir)) @@\
MakeDir(Concat($(DESTDIR)$(VARDIR)/,mdir)) @@\
MakeDir(Concat($(DESTDIR),opath/cdir)) @@\
MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
if [ -d Concat($(DESTDIR)$(LIBDIR)/,cdir) ]; then \ @@\
RELPATH=`echo Concat($(LIBDIR)/,cdir) | \ @@\
if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
RELPATH=`echo opath/cdir | \ @@\
sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
cd Concat($(DESTDIR)$(LIBDIR)/,cdir); \ @@\
cd Concat($(DESTDIR),opath/cdir); \ @@\
if [ -d rdir -a ! -h rdir ]; then \ @@\
(cd rdir; tar cf - . | \ @@\
(cd Concat($(DESTDIR)$(VARDIR)/,mdir);\ @@\
(cd Concat($(DESTDIR),npath/mdir); \ @@\
tar xf -; exit 0); exit 0); \ @@\
fi; \ @@\
$(RM) -r rdir; \ @@\
$(LN) Concat($${RELPATH}$(VARDIR)/,mdir) ldir; \ @@\
$(LN) Concat($${RELPATH},npath/mdir) ldir; \ @@\
fi
#else
#define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath)
#endif
#endif
#ifndef LinkConfDirectory
#define LinkConfDirectory(mdir,cdir,rdir,ldir) LinkConfDirectoryLong(mdir,cdir,rdir,ldir,$(LIBDIR),$(CONFDIR))
#endif
#ifndef LinkVarDirectory
#define LinkVarDirectory(mdir,cdir,rdir,ldir) LinkConfDirectoryLong(mdir,cdir,rdir,ldir,$(LIBDIR),$(VARDIR))
#endif
/*
* LinkConfFileLong
*
* Make links from opath (<ProjectRoot>/lib/X11) to npath
* For example /usr/X11R6/lib/X11/xxx ==> /etc/X11/xxx so that X binaries
* can be mounted from a read-only volume like a CD-ROM;
* but files that may need to be edited can be stored locally on
* read-write media. If someone has an existing installation, be
* careful and move existing files to the new location in /etc.
* XXX Need to make the installation script do this when installing
* binary distributions.
*
* Since the link is used in the installation process, we need to
* make the link relative in order to honor $(DESTDIR) if it is set.
*/
#ifndef LinkConfFileLong
#if UseSeparateConfDir && HasSymLinks
#define LinkConfFileLong(cfile,lfile,opath,npath) @@\
install:: @@\
MakeDir(Concat($(DESTDIR),opath)) @@\
MakeDir(Concat($(DESTDIR),npath)) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
if [ -d Concat($(DESTDIR),opath) ]; then \ @@\
RELPATH=`echo opath | \ @@\
sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
cd Concat($(DESTDIR),opath); \ @@\
if [ -f lfile -a ! -h lfile ]; then \ @@\
cp -p lfile Concat($(DESTDIR),npath/cfile; \ @@\
fi; \ @@\
$(RM) -r lfile; \ @@\
$(LN) Concat($${RELPATH},npath/cfile) lfile; \ @@\
fi
#else
#define LinkVarDirectory(mdir,cdir,rdir,ldir)
#define LinkConfFileLong(cfile,lfile,opath,npath)
#endif
#endif
#ifndef LinkConfFile
#define LinkConfFile(cfile,lfile) LinkConfFileLong(cfile,lfile,$(LIBDIR),$(CONFDIR))
#endif
/*
* InstallMultipleDestFlags - generate rules to install multiple files at
* once during a particular step in the build using a specific set of install
......@@ -1766,6 +1822,16 @@ ProjectUnsharedLibReferences(varname,libname,libsource,$(BUILDLIBDIR))
Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\
Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\
LintLibReferences(varname,libname,libsource)
#endif
/*
* ProjectUnsharedFontLibReferences - unshared font libraries
*/
#ifndef ProjectUnsharedFontLibReferences
#define ProjectUnsharedFontLibReferences() @@\
DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
#endif
/*
......@@ -1775,6 +1841,17 @@ LintLibReferences(varname,libname,libsource)
#define SharedLibDependencies(libname,libsource,revname) /**/
#endif
/*
* SharedFontLibReferences - shared font libraries
*/
#ifndef SharedFontLibReferences
#define SharedFontLibReferences() @@\
SOFONTREV = SharedFontRev @@\
DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
#endif
/*
* SharedDSLibDependencies - shared library dependencies with data separation
*/
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.64 1999/08/14 10:48:58 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.65 2000/01/31 19:33:18 dawes Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -105,6 +105,12 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasVarDirectory
#define HasVarDirectory YES
#endif
#ifndef UseEtcX11
#define UseEtcX11 YES
#endif
#ifndef UseSeparateConfDir
#define UseSeparateConfDir (UseEtcX11 || HasVarDirectory)
#endif
#ifndef SystemV
#define SystemV NO /* SYSV (R3) */
#endif
......@@ -158,8 +164,8 @@ XCOMM the platform-specific parameters - edit site.def to change
#endif
#endif
#ifndef HasVarDirectory
#define HasVarDirectory YES
#ifndef HasSymLinks
#define HasSymLinks YES
#endif
#include <Imake.rules>
......@@ -615,6 +621,26 @@ TCLIBDIR = TclLibDir
#endif
#endif
#ifndef HasVarRun
#define HasVarRun NO
#endif
#ifndef VarRunDirectory
#if HasVarRun
#define VarRunDirectory /var/run
#endif
#endif
#ifndef HasVarDb
#define HasVarDb NO
#endif
#ifndef VarDbDirectory
#if HasVarDb
#define VarDbDirectory /var/db
#endif
#endif
#ifndef ConfigSrc
#define ConfigSrc $(TOP)/config
#endif
......@@ -860,9 +886,6 @@ TCLIBDIR = TclLibDir
#ifndef CpCmd
#define CpCmd cp
#endif
#ifndef HasSymLinks
#define HasSymLinks YES
#endif
#ifndef LnCmd /* can use cp instead of ln if necessary */
#if HasSymLinks
#define LnCmd ln -s
......@@ -1228,6 +1251,12 @@ TCLIBDIR = TclLibDir
MISCMANDIR = MiscManDir /* man pages for miscellaneous files */
DRIVERMANDIR = DriverManDir /* man pages for drivers */
LOGDIRECTORY = LogDirectory /* OS location of log files */
#ifdef VarRunDirectory
VARRUNDIR = VarRunDirectory /* OS location of PID files */
#endif
#ifdef VarDbDirectory
VARDBDIR = VarDbDirectory /* OS location of db/state files */
#endif
AR = ArCmd
BOOTSTRAPCFLAGS = BootstrapCFlags /* set if cpp does not have uniq sym */
......
XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $
XCOMM $XFree86: xc/config/cf/Imakefile,v 3.21 1999/12/27 00:39:16 robin Exp $
XCOMM $XFree86: xc/config/cf/Imakefile,v 3.22 2000/01/21 02:29:34 dawes Exp $
XCOMM Some compilers generate fatal errors if an -L directory does
XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use.
......@@ -34,6 +34,7 @@ lnxLib.rules \
lnxdoc.rules \
necLib.rules \
noop.rules \
nto.rules \
oldlib.rules \
os2.rules \
os2Lib.rules \
......@@ -101,6 +102,7 @@ minix.cf \
moto.cf \
ncr.cf \
nec.cf \
nto.cf \
os2.cf \
osf1.cf \
pegasus.cf \
......
......@@ -2,7 +2,7 @@ XCOMM platform: $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $
XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.76 1999/12/14 02:40:07 robin Exp $
XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.79 2000/02/21 18:05:30 dawes Exp $
#ifndef OSName
......@@ -68,6 +68,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasMkstemp YES
#endif
#define HasUsableFileMmap YES
#define HasVarRun YES
#define HasVarDb YES
/*
* Compiler Features
*/
......@@ -266,7 +270,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
*/
#if defined(i386Architecture)
# ifndef HasNetBSDApertureDriver
# define HasNetBSDApertureDriver YES
# define HasNetBSDApertureDriver NO
/* Where the aperture driver is installed */
# ifndef NetBSDApertureDir
# define NetBSDApertureDir /usr/local/aperture
......@@ -333,8 +337,8 @@ install.man:: @@\
MakeDir($(DESTDIR)dest) @@\
case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
for i in list; do \ @@\
(set -x; \ @@\
MNAME=`echo $$i | cut -f1 -d.`; \ @@\
(MNAME=`echo $$i | cut -f1 -d.`; \ @@\
set -x; \ @@\
cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
| $(COL) > $${MNAME}.0; \ @@\
$(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \ @@\
......
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.24 1999/11/19 13:53:21 hohndel Exp $
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.27 2000/02/11 18:06:37 dawes Exp $
XCOMM
XCOMM $OpenBSD: OpenBSD.cf,v 1.33 1998/09/27 04:52:48 rahnds Exp $
XCOMM
......@@ -44,6 +44,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasNCurses YES
#define NCursesLibName -lcurses
#define HasVarRun YES
#define HasVarDb YES
/*
* Compiler Features
*/
......@@ -211,8 +214,8 @@ install.man:: @@\
MakeDir($(DESTDIR)dest) @@\
case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
for i in list; do \ @@\
(set -x; \ @@\
MNAME=`echo $$i | cut -f1 -d.`; \ @@\
(MNAME=`echo $$i | cut -f1 -d.`; \ @@\
set -x; \ @@\
cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\
| $(COL) > $${MNAME}.0; \ @@\
$(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \ @@\
......@@ -333,6 +336,19 @@ install:: fonts.alias @@\
#endif
#endif
/* Support for USB Mices */
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
#define UsbMouseSupport YES
#endif
/*
* A hack to work around an optimisation problem with the compiler on
* OpenBSD 2.6-current in late 1999/early 2000.
*/
#if OSMajorVersion == 2 && OSMinorVersion == 6
#define FreeBSDGccOptBug
#endif
# include <xfree86.cf>
#endif /* i386Architecture */
......
XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.1 1999/12/27 00:45:43 robin Exp $
XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.2 2000/01/21 02:29:34 dawes Exp $
#define NewInput NO
#define StripInstalledPrograms NO
#define BuildServer YES
#define DoLoadableServer NO /* sorry, are u listenning QSSL? */
......
XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.15 1999/10/13 04:20:41 dawes Exp $
XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.16 2000/02/18 16:23:07 dawes Exp $
/*
* Server imakefile info - this contains any special redefinitions, etc.
* that Imakefiles in the server subtree will need.
......@@ -28,6 +28,9 @@ XCOMM $TOG: Server.tmpl /main/15 1997/07/16 14:43:38 kaleb $
#ifndef DoLoadableServer
#define DoLoadableServer NO
#endif
#ifndef MakeDllModules
#define MakeDllModules NO
#endif
#ifndef InstallServerSetUID
#define InstallServerSetUID NO
#endif
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.54 1999/11/19 13:53:21 hohndel Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.59 2000/02/18 16:23:07 dawes Exp $
/***************************************************************************
* *
......@@ -151,6 +151,12 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.54 1999/11/19 13:53:21 hohndel Exp $
#ifndef BuildDPMS
#define BuildDPMS YES
#endif
#ifndef BuildFontCache
#define BuildFontCache YES
#endif
#ifndef BuildFontCacheLib
#define BuildFontCacheLib BuildFontCache
#endif
#ifndef BuildLowMem
#define BuildLowMem NO
#endif
......@@ -283,6 +289,18 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.54 1999/11/19 13:53:21 hohndel Exp $
#ifndef BuildXF86RushLibrary
#define BuildXF86RushLibrary BuildXF86RushExt
#endif
#ifndef BuildDPSLibraries
#define BuildDPSLibraries YES
#endif
#ifndef BuildDPSLibrary
#define BuildDPSLibrary BuildDPSLibraries
#endif
#ifndef BuildDPSTkLibrary
#define BuildDPSTkLibrary BuildDPSLibraries
#endif
#ifndef BuildPSResLibrary
#define BuildPSResLibrary BuildDPSLibraries
#endif
#ifndef BuildMiscDocs
#define BuildMiscDocs NO
......@@ -701,6 +719,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
#ifndef FontCacheExtentionDefines
#if BuildFontCache
#define FontCacheExtensionDefines -DFONTCACHE
#else
#define FontCacheExtensionDefines /**/
#endif
#endif
#ifndef SitePervasiveExtensionDefines
#define SitePervasiveExtensionDefines /**/
#endif
......@@ -722,7 +748,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
PexDefines ShmDefines XieDefines BigReqDefines VidModeExtensionDefines \
XF86MiscExtensionDefines DBEDefines DPMSDefines EVIDefines \
ScreenSaverExtensionDefines XvExtensionDefines XantiExtensionDefines \
GlxDefines SiteExtensionDefines
GlxDefines FontCacheExtensionDefines SiteExtensionDefines
#endif
#define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
#endif /* ExtensionDefines */
......@@ -806,7 +832,11 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define HasBlindFaithInUnicode YES
#endif
#ifndef XTrueTypeCConvModule
#if DoLoadableServer
#define XTrueTypeCConvModule YES
#else
#define XTrueTypeCConvModule NO
#endif
#endif
#ifndef XTrueTypeUseOptEncodings
#define XTrueTypeUseOptEncodings YES
......@@ -817,6 +847,12 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef XTrueTypeInstallCConvHeaders
#define XTrueTypeInstallCConvHeaders YES
#endif
#ifndef XTrueTypeCConvModuleDir
#define XTrueTypeCConvModuleDir $(USRLIBDIR)/modules
#endif
#ifndef XTrueTypeCConvModuleSubDir
#define XTrueTypeCConvModuleSubDir codeconv
#endif
#ifndef XTrueTypeDebugXTT
#define XTrueTypeDebugXTT NO
#endif
......@@ -896,6 +932,13 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef ModuleDir
#define ModuleDir $(USRLIBDIR)/modules
#endif
#ifndef LibexecDir
#ifdef ProjectRoot
#define LibexecDir Concat(ProjectRoot,/libexec)
#else
#define LibexecDir /usr/X11/libexec
#endif
#endif
#ifndef ConfigDir
#define ConfigDir $(LIBDIR)/config
#endif
......@@ -962,6 +1005,9 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef VarDirectory
#define VarDirectory /var/X11
#endif
#ifndef EtcX11Directory
#define EtcX11Directory /etc/X11
#endif
#ifndef InstallSecurityConfig
#define InstallSecurityConfig YES /* Install sample security policy */
#endif
......@@ -1052,11 +1098,20 @@ XCOMM X Window System make variables; these need to be coordinated with rules
INCDIR = $(INCROOT) /* header files */
ADMDIR = AdmDir /* server log files */
LIBDIR = LibDir /* rgb, XErrorDB, etc. */
LIBEXECDIR = LibexecDir
MODULEDIR = ModuleDir
TOP_X_INCLUDES = TopXInclude
#ifdef VarDirectory
VARDIR = VarDirectory
#endif
#ifdef EtcX11Directory
ETCX11DIR = EtcX11Directory
#endif
#if UseEtcX11
CONFDIR = $(ETCX11DIR)
#elif HasVarDirectory
CONFDIR = $(VARDIR)
#endif
DOCDIR = DocDir
DOCHTMLDIR = DocHtmlDir
......@@ -1283,6 +1338,51 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
#endif
#endif
#if BuildDPSLibrary