summaryrefslogtreecommitdiff
path: root/xc/config/cf
diff options
context:
space:
mode:
Diffstat (limited to 'xc/config/cf')
-rw-r--r--xc/config/cf/FreeBSD.cf39
-rw-r--r--xc/config/cf/Imake.cf27
-rw-r--r--xc/config/cf/Imake.rules109
-rw-r--r--xc/config/cf/Imake.tmpl41
-rw-r--r--xc/config/cf/Imakefile4
-rw-r--r--xc/config/cf/NetBSD.cf12
-rw-r--r--xc/config/cf/OpenBSD.cf22
-rw-r--r--xc/config/cf/QNX4.cf3
-rw-r--r--xc/config/cf/Server.tmpl5
-rw-r--r--xc/config/cf/X11.tmpl178
-rw-r--r--xc/config/cf/bsdLib.rules13
-rw-r--r--xc/config/cf/ibmLib.rules28
-rw-r--r--xc/config/cf/linux.cf34
-rw-r--r--xc/config/cf/lnxdoc.rules33
-rw-r--r--xc/config/cf/lynx.cf7
-rw-r--r--xc/config/cf/svr3.cf6
-rw-r--r--xc/config/cf/usl.cf15
-rw-r--r--xc/config/cf/xfree86.cf720
18 files changed, 873 insertions, 423 deletions
diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf
index 3a9e78a73..1043ed8bf 100644
--- a/xc/config/cf/FreeBSD.cf
+++ b/xc/config/cf/FreeBSD.cf
@@ -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
diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf
index 32b9b9c2c..00954b912 100644
--- a/xc/config/cf/Imake.cf
+++ b/xc/config/cf/Imake.cf
@@ -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.
diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules
index 1b0c4a462..ee1466d20 100644
--- a/xc/config/cf/Imake.rules
+++ b/xc/config/cf/Imake.rules
@@ -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
@@ -1768,6 +1824,16 @@ 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
+
/*
* SharedLibDependencies - shared library dependencies
*/
@@ -1776,6 +1842,17 @@ LintLibReferences(varname,libname,libsource)
#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
*/
#ifndef SharedDSLibDependencies
diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl
index 774f3d290..e002473c0 100644
--- a/xc/config/cf/Imake.tmpl
+++ b/xc/config/cf/Imake.tmpl
@@ -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 */
diff --git a/xc/config/cf/Imakefile b/xc/config/cf/Imakefile
index 948d79895..dfc9a5904 100644
--- a/xc/config/cf/Imakefile
+++ b/xc/config/cf/Imakefile
@@ -1,5 +1,5 @@
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 \
diff --git a/xc/config/cf/NetBSD.cf b/xc/config/cf/NetBSD.cf
index ec30ecc01..9198ce454 100644
--- a/xc/config/cf/NetBSD.cf
+++ b/xc/config/cf/NetBSD.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 \ @@\
diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf
index 9831dc4bf..e23ce866e 100644
--- a/xc/config/cf/OpenBSD.cf
+++ b/xc/config/cf/OpenBSD.cf
@@ -1,4 +1,4 @@
-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 */
diff --git a/xc/config/cf/QNX4.cf b/xc/config/cf/QNX4.cf
index e04df5c18..28135238f 100644
--- a/xc/config/cf/QNX4.cf
+++ b/xc/config/cf/QNX4.cf
@@ -1,6 +1,5 @@
-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? */
diff --git a/xc/config/cf/Server.tmpl b/xc/config/cf/Server.tmpl
index 90f71371a..42aadf311 100644
--- a/xc/config/cf/Server.tmpl
+++ b/xc/config/cf/Server.tmpl
@@ -1,4 +1,4 @@
-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
diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl
index f950f8a3a..7f8251799 100644
--- a/xc/config/cf/X11.tmpl
+++ b/xc/config/cf/X11.tmpl
@@ -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,12 +1098,21 @@ 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
DOCPSDIR = DocPsDir
@@ -1283,6 +1338,51 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
#endif
#endif
+#if BuildDPSLibrary
+#ifndef SharedLibDps
+#define SharedLibDps HasSharedLibraries
+#endif
+#ifndef NormalLibDps
+#define NormalLibDps YES
+#endif
+#ifndef DebugLibDps
+#define DebugLibDps NO
+#endif
+#ifndef ProfileLibDps
+#define ProfileLibDps NO
+#endif
+#endif
+
+#if BuildDPSTkLibrary
+#ifndef SharedLibDpsTk
+#define SharedLibDpsTk HasSharedLibraries
+#endif
+#ifndef NormalLibDpsTk
+#define NormalLibDpsTk YES
+#endif
+#ifndef DebugLibDpsTk
+#define DebugLibDpsTk NO
+#endif
+#ifndef ProfileLibDpsTk
+#define ProfileLibDpsTk NO
+#endif
+#endif
+
+#if BuildPSResLibrary
+#ifndef SharedLibPSRes
+#define SharedLibPSRes HasSharedLibraries
+#endif
+#ifndef NormalLibPSRes
+#define NormalLibPSRes YES
+#endif
+#ifndef DebugLibPSRes
+#define DebugLibPSRes NO
+#endif
+#ifndef ProfileLibPSRes
+#define ProfileLibPSRes NO
+#endif
+#endif
+
#if BuildXantiLibrary
#ifndef SharedLibXanti
#define SharedLibXanti NO
@@ -1413,6 +1513,42 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir)
#endif
#endif
+#if BuildDPSLibrary
+ DPSLIBSRC = $(LIBSRC)/dps
+#if SharedLibDps
+#ifndef SharedDpsRev
+#define SharedDpsRev 1.0
+#endif
+SharedLibReferences(DPS,dps,$(DPSLIBSRC),SODPSREV,SharedDpsRev)
+#else
+ProjectUnsharedLibReferences(DPS,dps,$(DPSLIBSRC),XBuildLibDir)
+#endif
+#endif
+
+#if BuildDPSTkLibrary
+ DPSTKLIBSRC = $(LIBSRC)/dpstk
+#if SharedLibDpsTk
+#ifndef SharedDpsTkRev
+#define SharedDpsTkRev 1.0
+#endif
+SharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),SODPSTKREV,SharedDpsTkRev)
+#else
+ProjectUnsharedLibReferences(DPSTK,dpstk,$(DPSTKLIBSRC),XBuildLibDir)
+#endif
+#endif
+
+#if BuildPSResLibrary
+ PSRESLIBSRC = $(LIBSRC)/psres
+#if SharedLibPSRes
+#ifndef SharedPSResRev
+#define SharedPSResRev 1.0
+#endif
+SharedLibReferences(PSRES,psres,$(PSRESLIBSRC),SOPSRESREV,SharedPSResRev)
+#else
+ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir)
+#endif
+#endif
+
#if BuildXantiLibrary
XANTILIBSRC = $(LIBSRC)/Xanti
#if SharedLibXanti
@@ -1439,6 +1575,30 @@ ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir)
+#if BuildFontCacheLib
+# ifndef SharedLibXfontcache
+# define SharedLibXfontcache NO
+# endif
+# ifndef NormalLibXfontcache
+# define NormalLibXfontcache YES
+# endif
+# ifndef DebugLibXfontcache
+# define DebugLibXfontcache NO
+# endif
+# ifndef ProfileLibXfontcache
+# define ProfileLibXfontcache NO
+# endif
+ XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
+#if SharedLibXfontcache
+#ifndef SharedXfontcacheRev
+#define SharedXfontcacheRev 1.2
+#endif
+SharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),SOXFONTCACHEREV,SharedXfontcacheRev)
+#else
+ProjectUnsharedLibReferences(XFONTCACHE,Xfontcache,$(XFONTCACHELIBSRC),XBuildLibDir)
+#endif
+#endif
+
#ifndef SharedLibXau
#define SharedLibXau NO /* don't need shared form */
#endif
@@ -1498,7 +1658,7 @@ ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir)
XMUSRC = $(LIBSRC)/Xmu
#if SharedLibXmu
#ifndef SharedXmuRev
-#define SharedXmuRev 6.0
+#define SharedXmuRev 6.1
#endif
SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev)
#else
@@ -1856,11 +2016,13 @@ ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir)
FONTLIBSRC = $(LIBSRC)/font
#if SharedLibFont
#ifndef SharedFontRev
-#define SharedFontRev 1.0
+#define SharedFontRev 1.3
#endif
-SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
+SharedFontLibReferences()
+XCOMM SharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
#else
-ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir)
+ProjectUnsharedFontLibReferences()
+XCOMM ProjectUnsharedLibReferences(XFONT,Xfont,$(FONTLIBSRC),XBuildLibDir)
#endif
FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
@@ -1991,11 +2153,11 @@ ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir)
#ifndef InstallAppDefaultsLong
#if InstallAppDefFiles
#define InstallAppDefaultsLong(file,class) @@\
-LinkVarDirectory(app-defaults,.,app-defaults,.) @@\
+LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#else
#define InstallAppDefaultsLong(file,class) @@\
-LinkVarDirectory(app-defaults,.,app-defaults,.) @@\
+LinkConfDirectory(app-defaults,.,app-defaults,.) @@\
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#endif /* InstallAppDefFiles */
#endif /* InstallAppDefaultsLong */
diff --git a/xc/config/cf/bsdLib.rules b/xc/config/cf/bsdLib.rules
index 612769bd2..c4885b7de 100644
--- a/xc/config/cf/bsdLib.rules
+++ b/xc/config/cf/bsdLib.rules
@@ -4,7 +4,7 @@ XCOMM $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $
-XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.12 1999/06/06 08:47:44 dawes Exp $
+XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.13 2000/02/13 06:15:18 dawes Exp $
/*
* NetBSD/FreeBSD shared library rules
*/
@@ -128,6 +128,17 @@ Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\
LintLibReferences(varname,libname,libsource)
#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
+
/*
* SharedDSLibReferences - variables for shared libraries
*/
diff --git a/xc/config/cf/ibmLib.rules b/xc/config/cf/ibmLib.rules
index 9ce85cf31..2e5c9feb2 100644
--- a/xc/config/cf/ibmLib.rules
+++ b/xc/config/cf/ibmLib.rules
@@ -4,7 +4,7 @@ XCOMM $XConsortium: ibmLib.rules /main/15 1996/12/30 16:06:05 kaleb $
* AIX shared library rules
*/
-XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.4 1999/01/11 05:13:06 dawes Exp $
+XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.5 2000/02/13 06:15:18 dawes Exp $
#ifndef HasSharedLibraries
# define HasSharedLibraries YES
@@ -82,7 +82,7 @@ XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.4 1999/01/11 05:13:06 dawes Exp $
# if OSMajorVersion < 4
/*
- * SharedDSLibReferences - variables for shared libraries
+ * SharedLibReferences - variables for shared libraries
*/
# ifndef SharedLibReferences
@@ -92,6 +92,30 @@ Concat(varname,LIB) = _Use(Concat(-l,libname),Concat(libsource/lib,libname.a)) @
LintLibReferences(varname,libname,libsource)
# endif
+# endif
+
+# if OSMajorVersion < 4
+/*
+ * SharedFontLibReferences - shared font libraries
+ */
+
+# ifndef SharedLibReferences
+# define SharedLibReferences() @@\
+DEPFONTLIB = /**/ @@\
+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\
+LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+# endif
+
+# else
+
+# ifndef SharedFontLibReferences
+# define SharedFontLibReferences() @@\
+DEPFONTLIB = /**/ @@\
+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI
+)/libXfont.a)) @@\
+LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+# endif
+
# else
# ifndef SharedLibReferences
diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf
index c20951ac7..31a05aa48 100644
--- a/xc/config/cf/linux.cf
+++ b/xc/config/cf/linux.cf
@@ -1,5 +1,5 @@
XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
-XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.108 1999/12/03 19:17:17 eich Exp $
+XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.115 2000/02/21 18:05:31 dawes Exp $
#ifndef LinuxElfDefault
#define LinuxElfDefault YES
@@ -98,6 +98,12 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define LinuxLocaleDefines -DX_LOCALE
#endif
+#if LinuxDistribution == LinuxDebian
+#define LinuxAdditionalIncludes -I/usr/src/linux/include
+#else
+#define LinuxAdditionalIncludes /**/
+#endif
+
#ifndef LinuxGnuSourceDefines
#ifdef UseInstalled
#define LinuxGnuSourceDefines /**/
@@ -110,7 +116,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE -D_XOPEN_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE \
- LinuxGnuSourceDefines LinuxLocaleDefines
+ LinuxAdditionalIncludes LinuxGnuSourceDefines \
+ LinuxLocaleDefines
#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
#define HasPosixThreads YES
#define ThreadedX YES
@@ -120,7 +127,10 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifndef HasLibCrypt
#define HasLibCrypt YES
#endif
-#define HasPoll YES
+/* netscape wraps select but not poll as of communicator 4.72 */
+#ifndef HasPoll
+#define HasPoll NO
+#endif
#else
#define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \
-D_BSD_SOURCE -D_SVID_SOURCE \
@@ -146,11 +156,12 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#endif
#endif
-#define XF86INT10 YES
-#ifdef i386Architecture
-#define XF86INT10_BUILD X86VM
-#elif defined(X86EMU_LIBPATH)
-# define XF86INT10_BUILD X86EMU_OS
+#ifndef XF86INT10_BUILD
+# ifdef i386Architecture
+# define XF86INT10_BUILD X86VM
+# elif defined(X86EMU_LIBPATH)
+# define XF86INT10_BUILD X86EMU_GENERIC
+# endif
#endif
/* The DRM module requires kernel services that appeared in late 2.1.x
@@ -370,6 +381,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define StandardCppOptions -traditional
#define StandardCppDefines StandardDefines
+#define HasVarRun YES
+#define VarDbDirectory /var/state
+
+#ifndef HasAgpGart
+#define HasAgpGart NO
+#endif
+
#ifndef XF86ExtraCardDrivers
#define XF86ExtraCardDrivers v4l
#endif
diff --git a/xc/config/cf/lnxdoc.rules b/xc/config/cf/lnxdoc.rules
index e058373b6..26b099815 100644
--- a/xc/config/cf/lnxdoc.rules
+++ b/xc/config/cf/lnxdoc.rules
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.16 1999/07/04 08:31:00 dawes Exp $
+XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.18 2000/01/25 01:36:53 dawes Exp $
XCOMM
XCOMM Rules for formatting Linuxdoc-SGML documentation
XCOMM
@@ -75,10 +75,39 @@ clean:: @@\
#define LinuxDocSgmlToHtml(sgmlfile,base) /**/
#endif
+/*
+ * Rule for maintainers to use to updated formatted copies of docs in the
+ * source tree. Use with care.
+ */
+
+#ifndef UpdateFormattedDoc
+#define UpdateFormattedDoc(textfile) @@\
+update.docs:: textfile @@\
+ @if [ -f $(FORMATTEDDIR)/textfile ]; then \ @@\
+ if [ "$(FORCEUPDATE)" = yes ]; then set -x; \ @@\
+ cp textfile $(FORMATTEDDIR)/textfile; \ @@\
+ echo "" >> $(FORMATTEDDIR)/textfile; \ @@\
+ echo "\$$XFree86\$$" >> $(FORMATTEDDIR)/textfile; \ @@\
+ else \ @@\
+ $(RM) __tmp1__ __tmp2__; \ @@\
+ grep "Generated from XFree86:" textfile > __tmp1__; \ @@\
+ grep "Generated from XFree86:" $(FORMATTEDDIR)/textfile > __tmp2__; \ @@\
+ if diff __tmp1__ __tmp2__ > /dev/null 2>&1; then :; \ @@\
+ else set -x; \ @@\
+ cp textfile $(FORMATTEDDIR)/textfile ; \ @@\
+ echo "" >> $(FORMATTEDDIR)/textfile; \ @@\
+ echo "\$$XFree86\$$" >> $(FORMATTEDDIR)/textfile; \ @@\
+ fi; \ @@\
+ fi; \ @@\
+ fi @@\
+ @$(RM) __tmp1__ __tmp2__
+#endif
+
#define LinuxDocTargetLong(sgmlfile,textfile,base) @@\
LinuxDocSgmlToText(sgmlfile,textfile) @@\
LinuxDocSgmlToHtml(sgmlfile,base) @@\
-LinuxDocSgmlToPs(sgmlfile,base)
+LinuxDocSgmlToPs(sgmlfile,base) @@\
+UpdateFormattedDoc(textfile)
#define LinuxDocReadmeTarget(base) @@\
LinuxDocTargetLong(base.sgml,ReadmeFile(base),base)
diff --git a/xc/config/cf/lynx.cf b/xc/config/cf/lynx.cf
index 33faa351e..a1fb27147 100644
--- a/xc/config/cf/lynx.cf
+++ b/xc/config/cf/lynx.cf
@@ -1,4 +1,4 @@
-XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.31 1999/12/08 06:10:01 dawes Exp $
+XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.33 2000/02/14 19:20:18 dawes Exp $
#ifndef OSName
@@ -89,6 +89,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define NeedVarargsPrototypes YES
#define NeedWidePrototypes NO
#define MkdirHierCmd mkdir -p
+#define DirFailPrefix -
#if HasGcc2
# if OSMajorVersion == 2 && OSMinorVersion == 3
@@ -312,8 +313,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}*; \ @@\
groff -e -t -man -Tascii $$i >/tmp/$$i; \ @@\
$(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
diff --git a/xc/config/cf/svr3.cf b/xc/config/cf/svr3.cf
index 46952157e..0d4b0b529 100644
--- a/xc/config/cf/svr3.cf
+++ b/xc/config/cf/svr3.cf
@@ -2,7 +2,7 @@ XCOMM $XConsortium: svr3.cf /main/1 1996/10/31 14:47:37 kaleb $
-XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.10 1997/05/24 13:46:28 dawes Exp $
+XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.11 2000/01/25 18:37:30 dawes Exp $
#ifndef HasGcc
#define HasGcc YES
@@ -285,8 +285,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}*; \ @@\
$(RMDSDEMACCMD) $$i | neqn | nroff -man >/tmp/$$i; \ @@\
$(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
diff --git a/xc/config/cf/usl.cf b/xc/config/cf/usl.cf
index 5f8176d5a..58ea98f9b 100644
--- a/xc/config/cf/usl.cf
+++ b/xc/config/cf/usl.cf
@@ -3,7 +3,7 @@ XCOMM platform: $TOG: usl.cf /main/50 1997/04/17 14:11:39 barstow $
-XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.17 1999/12/08 21:36:56 robin Exp $
+XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.19 2000/02/15 16:55:09 dawes Exp $
#ifndef OSName
# define OSName DefaultOSName
@@ -43,7 +43,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
#else
#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
#endif
-#if OSTeenyVersion > 1
+#if OSMajorVersion > 1 || OSTeenyVersion > 1
# define ExtraLibraries -lsocket -lnsl -lgen -lw
# define ThreadedX YES
# define HasThreadSafeAPI NO
@@ -63,6 +63,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
#define GencatFlags -m
+#define HasStrcasecmp NO
+#ifndef HasSnprintf
+#define HasSnprintf YES
+#endif
+
+
#include <svr4.cf>
/*
@@ -87,11 +93,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
#define DtWidgetDefines DtSearchDefines
#define DtPrintDefines DtSearchDefines
-#define HasStrcasecmp NO
-#ifndef HasSnprintf
-#define HasSnprintf YES
-#endif
-
/* For DtHelp's TIFF processing routines. */
#define LSBBitOrder YES
diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf
index 87bcad5c6..ac71d41ce 100644
--- a/xc/config/cf/xfree86.cf
+++ b/xc/config/cf/xfree86.cf
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.255 2000/01/03 14:29:59 robin Exp $
+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.269 2000/02/17 13:50:02 dawes Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
@@ -11,6 +11,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
/*
* settings for the config file parser
*/
+
#ifndef XConfigFile
#define XConfigFile XF86Config
#endif
@@ -49,117 +50,126 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
* are supported on this platform.
*/
#ifdef i386Architecture
-#ifndef XF86Server
-#define XF86Server YES
-#endif
+# ifndef XF86Server
+# define XF86Server YES
+# endif
/* 1bpp module */
-#ifndef XF1Bpp
-#define XF1Bpp YES
-#endif
+# ifndef XF1Bpp
+# define XF1Bpp YES
+# endif
/* 4bpp module */
-#ifndef XF4Bpp
-#define XF4Bpp YES
-#endif
+# ifndef XF4Bpp
+# define XF4Bpp YES
+# endif
/* 8/32bpp overlay module */
-#ifndef XF8_32Bpp
-#define XF8_32Bpp YES
-#endif
+# ifndef XF8_32Bpp
+# define XF8_32Bpp YES
+# endif
/* 8/16bpp dual fb module */
-#ifndef XF8_16Bpp
-#define XF8_16Bpp YES
-#endif
+# ifndef XF8_16Bpp
+# define XF8_16Bpp YES
+# endif
/* 24/32bpp conversion module */
-#ifndef XF24_32Bpp
-#define XF24_32Bpp YES
-#endif
+# ifndef XF24_32Bpp
+# define XF24_32Bpp YES
+# endif
/* shadow fb module */
-#ifndef XFShadowFB
-#define XFShadowFB YES
-#endif
+# ifndef XFShadowFB
+# define XFShadowFB YES
+# endif
/* vgahw module */
-#ifndef XF86VgaHw
-#define XF86VgaHw YES
-#endif
+# ifndef XF86VgaHw
+# define XF86VgaHw YES
+# endif
/* fbdevhw module */
-#ifndef XF86FBDevHw
-#define XF86FBDevHw YES
-#endif
+# ifndef XF86FBDevHw
+# define XF86FBDevHw YES
+# endif
/* XAA module */
-#ifndef XF86XAA
-#define XF86XAA YES
-#endif
+# ifndef XF86XAA
+# define XF86XAA YES
+# endif
/* ramdac module */
-#ifndef XF86Ramdac
-#define XF86Ramdac YES
-#endif
+# ifndef XF86Ramdac
+# define XF86Ramdac YES
+# endif
/* I2C module */
-#ifndef XF86I2C
-#define XF86I2C YES
-#endif
+# ifndef XF86I2C
+# define XF86I2C YES
+# endif
/* DDC module */
-#ifndef XF86DDC
-#define XF86DDC YES
-#endif
+# ifndef XF86DDC
+# define XF86DDC YES
+# endif
/* RAC (Resource Access Control) module */
-#ifndef XF86RAC
-#define XF86RAC YES
-#endif
+# ifndef XF86RAC
+# define XF86RAC YES
+# endif
+
/* int10 module */
-#ifndef XF86INT10
-#define XF86INT10 NO
-#endif
-#define X86EMU_GENERIC 1
-#define X86VM 2
-#define X86EMU_OS 3
+# ifndef XF86Int10
+# define XF86Int10 YES
+# endif
/*
* Amiga framebuffer module.
* This is for build testing only. It isn't actually used on this platform.
*/
-#ifndef XF86AFB
-#define XF86AFB YES
-#endif
+# ifndef XF86AFB
+# define XF86AFB YES
+# endif
+
+/*
+ * XXX Should change this to allow such drivers to be built without agpgart
+ * support (when it is useful to do so).
+ */
+# if HasAgpGart
+# define AgpGartDrivers i810
+# else
+# define AgpGartDrivers /**/
+# endif
/* Pure PCI drivers should go first */
-#ifndef XF86CardDrivers
-#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
+# ifndef XF86CardDrivers
+# define XF86CardDrivers mga glint nv tga s3virge sis rendition \
neomagic i740 tdfx \
cirrus tseng trident chips apm \
GlideDriver fbdev \
- ati r128 vga XF86ExtraCardDrivers
-#endif
+ ati r128 AgpGartDrivers cyrix \
+ vga XF86ExtraCardDrivers
+# endif
#endif
/* Sparc drivers */
#if defined(SparcArchitecture) && !defined(LynxOSArchitecture)
-#ifndef XF86Server
-#define XF86Server YES
-#endif
+# ifndef XF86Server
+# define XF86Server YES
+# endif
/* 1bpp module */
-#ifndef XF1Bpp
-#define XF1Bpp YES
-#endif
+# ifndef XF1Bpp
+# define XF1Bpp YES
+# endif
/* shadow fb module */
-#ifndef XFShadowFB
-#define XFShadowFB YES
-#endif
+# ifndef XFShadowFB
+# define XFShadowFB YES
+# endif
/* fbdevhw module */
-#ifndef XF86FBDevHw
-#define XF86FBDevHw YES
-#endif
+# ifndef XF86FBDevHw
+# define XF86FBDevHw YES
+# endif
/* XAA module */
-#ifndef XF86XAA
-#define XF86XAA YES
-#endif
+# ifndef XF86XAA
+# define XF86XAA YES
+# endif
/* DDC module */
-#ifndef XF86DDC
-#define XF86DDC YES
-#endif
+# ifndef XF86DDC
+# define XF86DDC YES
+# endif
-#ifndef XF86CardDrivers
-#define XF86CardDrivers fbdev XF86ExtraCardDrivers
-#endif
+# ifndef XF86CardDrivers
+# define XF86CardDrivers fbdev XF86ExtraCardDrivers
+# endif
#endif
@@ -168,156 +178,148 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
* are supported on this platform.
*/
#ifdef AlphaArchitecture
-#ifndef XF86Server
-#define XF86Server YES
-#endif
+# ifndef XF86Server
+# define XF86Server YES
+# endif
/* 1bpp module */
-#ifndef XF1Bpp
-#define XF1Bpp NO
-#endif
+# ifndef XF1Bpp
+# define XF1Bpp NO
+# endif
/* 4bpp module */
-#ifndef XF4Bpp
-#define XF4Bpp YES
-#endif
+# ifndef XF4Bpp
+# define XF4Bpp YES
+# endif
/* 8/32bpp overlay module */
-#ifndef XF8_32Bpp
-#define XF8_32Bpp YES
-#endif
+# ifndef XF8_32Bpp
+# define XF8_32Bpp YES
+# endif
/* 8/16bpp dual fb module */
-#ifndef XF8_16Bpp
-#define XF8_16Bpp YES
-#endif
+# ifndef XF8_16Bpp
+# define XF8_16Bpp YES
+# endif
/* 24/32bpp conversion module */
-#ifndef XF24_32Bpp
-#define XF24_32Bpp YES
-#endif
+# ifndef XF24_32Bpp
+# define XF24_32Bpp YES
+# endif
/* shadow fb module */
-#ifndef XFShadowFB
-#define XFShadowFB YES
-#endif
+# ifndef XFShadowFB
+# define XFShadowFB YES
+# endif
/* vgahw module */
-#ifndef XF86VgaHw
-#define XF86VgaHw YES
-#endif
+# ifndef XF86VgaHw
+# define XF86VgaHw YES
+# endif
/* fbdevhw module */
-#ifndef XF86FBDevHw
-#define XF86FBDevHw YES
-#endif
+# ifndef XF86FBDevHw
+# define XF86FBDevHw YES
+# endif
/* XAA module */
-#ifndef XF86XAA
-#define XF86XAA YES
-#endif
+# ifndef XF86XAA
+# define XF86XAA YES
+# endif
/* ramdac module */
-#ifndef XF86Ramdac
-#define XF86Ramdac YES
-#endif
+# ifndef XF86Ramdac
+# define XF86Ramdac YES
+# endif
/* I2C module */
-#ifndef XF86I2C
-#define XF86I2C YES
-#endif
+# ifndef XF86I2C
+# define XF86I2C YES
+# endif
/* DDC module */
-#ifndef XF86DDC
-#define XF86DDC YES
-#endif
+# ifndef XF86DDC
+# define XF86DDC YES
+# endif
/* RAC (Resource Access Control) module */
-#ifndef XF86RAC
-#define XF86RAC YES
-#endif
+# ifndef XF86RAC
+# define XF86RAC YES
+# endif
-/* Pure PCI drivers should go first */
-#ifndef XF86CardDrivers
-#define XF86CardDrivers mga tdfx glint s3virge rendition tga \
- vga XF86ExtraCardDrivers
-#endif
-#endif
+/* int10 module */
+# ifndef XF86Int10
+# define XF86Int10 YES
+# endif
-/*
- * For Motorola 68k platforms, the default is to build all modules which
- * are supported on this platform.
- */
-#ifdef Mc68020Architecture
-#ifndef XF68LoaderServer
-#define XF68LoaderServer DoLoadableServer
-#endif
-#ifndef XF68FBDevModule
-#define XF68FBDevModule XF68LoaderServer
-#endif
-#ifndef XF68LoaderServer
-#ifndef XF68FBDevServer
-#define XF68FBDevServer YES
-#endif
-#endif
+/* Pure PCI drivers should go first */
+# ifndef XF86CardDrivers
+# define XF86CardDrivers mga tdfx glint s3virge rendition tga \
+ r128 vga XF86ExtraCardDrivers
+# endif
#endif
/*
- * PPC (currently Linux and LynxOS)
+ * For Motorola 68k and PPC (currently Linux & LynxOS)
*/
-#if defined(PpcArchitecture)
-#ifndef XF86Server
-#define XF86Server YES
-#endif
+#if defined(PpcArchitecture) || defined(Mc68020Architecture)
+# ifndef XF86Server
+# define XF86Server YES
+# endif
/* Amiga framebuffer module */
-#ifndef XF86AFB
-#define XF86AFB YES
-#endif
+# ifndef XF86AFB
+# define XF86AFB YES
+# endif
/* 1bpp module */
-#ifndef XF1Bpp
-#define XF1Bpp YES
-#endif
+# ifndef XF1Bpp
+# define XF1Bpp YES
+# endif
/* 4bpp module */
-#ifndef XF4Bpp
-#define XF4Bpp YES
-#endif
+# ifndef XF4Bpp
+# define XF4Bpp YES
+# endif
/* 8/32bpp overlay module */
-#ifndef XF8_32Bpp
-#define XF8_32Bpp YES
-#endif
+# ifndef XF8_32Bpp
+# define XF8_32Bpp YES
+# endif
/* 8/16bpp dual fb module */
-#ifndef XF8_16Bpp
-#define XF8_16Bpp YES
-#endif
+# ifndef XF8_16Bpp
+# define XF8_16Bpp YES
+# endif
/* 24/32bpp conversion module */
-#ifndef XF24_32Bpp
-#define XF24_32Bpp YES
-#endif
+# ifndef XF24_32Bpp
+# define XF24_32Bpp YES
+# endif
/* shadow fb module */
-#ifndef XFShadowFB
-#define XFShadowFB YES
-#endif
+# ifndef XFShadowFB
+# define XFShadowFB YES
+# endif
/* vgahw module */
-#ifndef XF86VgaHw
-#define XF86VgaHw YES
-#endif
+# ifndef XF86VgaHw
+# define XF86VgaHw YES
+# endif
/* fbdevhw module */
-#ifndef XF86FBDevHw
-#define XF86FBDevHw YES
-#endif
+# ifndef XF86FBDevHw
+# define XF86FBDevHw YES
+# endif
/* XAA module */
-#ifndef XF86XAA
-#define XF86XAA YES
-#endif
+# ifndef XF86XAA
+# define XF86XAA YES
+# endif
/* ramdac module */
-#ifndef XF86Ramdac
-#define XF86Ramdac YES
-#endif
+# ifndef XF86Ramdac
+# define XF86Ramdac YES
+# endif
/* I2C module */
-#ifndef XF86I2C
-#define XF86I2C YES
-#endif
+# ifndef XF86I2C
+# define XF86I2C YES
+# endif
/* DDC module */
-#ifndef XF86DDC
-#define XF86DDC YES
-#endif
+# ifndef XF86DDC
+# define XF86DDC YES
+# endif
/* RAC (Resource Access Control) module */
-#ifndef XF86RAC
-#define XF86RAC YES
-#endif
+# ifndef XF86RAC
+# define XF86RAC YES
+# endif
+
+/* int10 module */
+# ifndef XF86Int10
+# define XF86Int10 YES
+# endif
/* Pure PCI drivers should go first */
-#ifndef XF86CardDrivers
-#define XF86CardDrivers mga glint s3virge sis cirrus tseng \
+# ifndef XF86CardDrivers
+# define XF86CardDrivers mga glint s3virge sis cirrus tseng \
trident chips fbdev vga XF86ExtraCardDrivers
-#endif
+# endif
#endif
@@ -325,10 +327,10 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
* 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
+# ifdef ArcArchitecture
+# ifndef XF86Server
+# define XF86Server YES
+# endif
#endif
@@ -337,19 +339,19 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
* on different architectures.
*/
#ifndef XF86AFB
-#define XF86AFB NO
+# define XF86AFB NO
#endif
#ifndef XF86ILBM
-#define XF86ILBM NO
+# define XF86ILBM NO
#endif
#ifndef XF86IPLAN2P2
-#define XF86IPLAN2P2 NO
+# define XF86IPLAN2P2 NO
#endif
#ifndef XF86IPLAN2P4
-#define XF86IPLAN2P4 NO
+# define XF86IPLAN2P4 NO
#endif
#ifndef XF86IPLAN2P8
-#define XF86IPLAN2P8 NO
+# define XF86IPLAN2P8 NO
#endif
#if XF86AFB
AFB_DEFS = -DUSE_AFB
@@ -367,7 +369,7 @@ IPLAN2P4_DEFS = -DUSE_IPLAN2P4
IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#endif
#ifndef FbdevDefines
-#define FbdevDefines $(AFB_DEFS) $(ILBM_DEFS) $(IPLAN2P2_DEFS) \
+# define FbdevDefines $(AFB_DEFS) $(ILBM_DEFS) $(IPLAN2P2_DEFS) \
$(IPLAN2P4_DEFS) $(IPLAN2P8_DEFS)
#endif
@@ -376,20 +378,20 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
* It the servers are only started by xdm, they should not be setuid-root.
*/
#if !defined(i386MachArchitecture) && !defined(OS2Architecture)
-#ifndef InstallXserverSetUID
-#define InstallXserverSetUID YES
-#endif
+# ifndef InstallXserverSetUID
+# define InstallXserverSetUID YES
+# endif
#endif
/*
* The server-side of PEX is not 64-bit clean.
*/
#if !defined(BuildPexExt)
-#if XF86Server && !defined(AlphaArchitecture)
-#define BuildPexExt YES
-#else
-#define BuildPexExt NO
-#endif
+# if XF86Server && !defined(AlphaArchitecture)
+# define BuildPexExt YES
+# else
+# define BuildPexExt NO
+# endif
#endif
@@ -444,7 +446,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
* DRI.
*/
#ifndef BuildXF86DRIDriverSupport
-#define BuildXF86DRIDriverSupport NO
+# define BuildXF86DRIDriverSupport NO
#endif
#if BuildGlxExt
@@ -479,60 +481,76 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#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
+# define BuildXF86RushExt NO
#endif
/*
* XIE
*/
#ifndef BuildXIE
-#if XF86Server
-#define BuildXIE YES
-#else
-#define BuildXIE NO
-#endif
+# if XF86Server
+# define BuildXIE YES
+# else
+# define BuildXIE NO
+# endif
#endif
#ifndef BuildXIElib
-#define BuildXIElib YES
+# define BuildXIElib YES
#endif
#ifndef BuildDBElib
-#define BuildDBElib YES
+# define BuildDBElib YES
#endif
#ifndef BuildRECORDlib
-#define BuildRECORDlib YES
+# define BuildRECORDlib YES
#endif
#ifndef BuildXKBlib
-#define BuildXKBlib YES
+# define BuildXKBlib YES
#endif
#ifndef BuildScreenSaverExt
-#define BuildScreenSaverExt YES
+# define BuildScreenSaverExt YES
#endif
/*
* Build XInput support
*/
#ifndef BuildXInputExt
-#define BuildXInputExt YES
+# define BuildXInputExt YES
#endif
/* Build Xinerama (aka panoramiX) extension */
#ifndef BuildXinerama
-#define BuildXinerama YES
+# define BuildXinerama YES
#endif
#if 0
#ifndef JoystickSupport
-#define JoystickSupport NO
+# define JoystickSupport NO
#endif
#endif
@@ -541,35 +559,32 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
* in the servers
*/
#ifndef BuildScreenSaverLibrary
-#define BuildScreenSaverLibrary YES
+# define BuildScreenSaverLibrary YES
#endif
#ifndef BuildXF86MiscLibrary
-#define BuildXF86MiscLibrary YES
+# define BuildXF86MiscLibrary YES
#endif
#ifndef BuildXF86DGALibrary
-#define BuildXF86DGALibrary YES
+# define BuildXF86DGALibrary YES
#endif
#ifndef BuildXF86VidModeLibrary
-#define BuildXF86VidModeLibrary YES
+# define BuildXF86VidModeLibrary YES
#endif
#ifndef BuildXvLibrary
-#define BuildXvLibrary YES
+# define BuildXvLibrary YES
#endif
#ifndef BuildXantiLibrary
-#define BuildXantiLibrary NO /* See the note for BuildXantiExt */
+# define BuildXantiLibrary NO /* See the note for BuildXantiExt */
#endif
#ifndef BuildGLXLibrary
-#define BuildGLXLibrary YES
-#endif
-#ifndef BuildXF86RushLibrary
-#define BuildXF86RushLibrary BuildXF86RushExt
+# define BuildGLXLibrary YES
#endif
/*
* Build the XFree86-VidMode extension
*/
#ifndef BuildXF86VidModeExt
-#define BuildXF86VidModeExt YES
+# define BuildXF86VidModeExt YES
#endif
/* Don't build this now because the interface hasn't been done yet */
@@ -577,14 +592,14 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
* Build the XFree86-Misc extension
*/
#ifndef BuildXF86MiscExt
-#define BuildXF86MiscExt NO
+# define BuildXF86MiscExt NO
#endif
/*
* Build the XFree86-Bigfont extension
*/
#ifndef BuildXF86BigfontExt
-#define BuildXF86BigfontExt HasShm
+# define BuildXF86BigfontExt YES
#endif
/*
@@ -592,43 +607,43 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
*/
/* There are problems building XF86Setup, so turn it off for now */
#ifndef BuildXF86Setup
-#define BuildXF86Setup NO
+# define BuildXF86Setup NO
#endif
#ifndef BuildXF86Setup
-#if HasTk && HasTcl && BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib
-#define BuildXF86Setup YES
-#else
-#define BuildXF86Setup NO
-#endif
+# if HasTk && HasTcl && BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib
+# define BuildXF86Setup YES
+# else
+# define BuildXF86Setup NO
+# endif
#endif
#ifndef XF86SetupUsesStaticTk
-#define XF86SetupUsesStaticTk YES
+# define XF86SetupUsesStaticTk YES
#endif
#ifndef XF86SetupUsesStaticTcl
-#define XF86SetupUsesStaticTcl YES
+# define XF86SetupUsesStaticTcl YES
#endif
/*
* Build the XFree86 DGA support
*/
#ifndef BuildXF86DGA
-#define BuildXF86DGA YES
+# define BuildXF86DGA YES
#endif
/*
* Build the DPMS extension support
*/
#ifndef BuildDPMSExt
-#define BuildDPMSExt YES
+# define BuildDPMSExt YES
#endif
/*
* Build the X Video Extension
*/
#ifndef BuildXvExt
-#define BuildXvExt YES
+# define BuildXvExt YES
#endif
/*
@@ -636,27 +651,27 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
* temporarily)
*/
#ifndef BuildXantiExt
-#define BuildXantiExt NO
+# define BuildXantiExt NO
#endif
#if Malloc0ReturnsNull
-#ifndef XtMalloc0ReturnsNullDefines
-#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC
-#endif
+# ifndef XtMalloc0ReturnsNullDefines
+# define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC
+# endif
#endif
#ifndef UseInternalMalloc
-#define UseInternalMalloc YES
+# define UseInternalMalloc YES
#endif
#ifndef HasDlsymBug
-#define HasDlsymBug NO
+# define HasDlsymBug NO
#endif
#ifndef HasMTRRSupport
-#define HasMTRRSupport NO
+# define HasMTRRSupport NO
#endif
/*
@@ -667,99 +682,99 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
* 866332800 is Sun Jun 15 00:00:00 1997 GMT
*/
#ifndef XF86ServerExpiry
-#define XF86ServerExpiry 866332800
+# define XF86ServerExpiry 866332800
#endif
/*
* Build the font server
*/
#ifndef BuildFontServer
-#define BuildFontServer YES
+# define BuildFontServer YES
#endif
/*
* Include fonts support
*/
#ifndef BuildSpeedo
-#define BuildSpeedo YES
+# define BuildSpeedo YES
#endif
#ifndef BuildType1
-#define BuildType1 YES
+# define BuildType1 YES
#endif
#ifndef BuildCID
-#define BuildCID YES
+# define BuildCID YES
#endif
#ifndef BuildFreeType
-#define BuildFreeType YES
+# define BuildFreeType YES
#endif
-#ifndef BuildXTT
-#define BuildXTT YES
+#ifndef BuildXTrueType
+# define BuildXTrueType YES
#endif
/*
* By default, build all of the fonts.
*/
#ifndef Build75DpiFonts
-#define Build75DpiFonts YES
+# define Build75DpiFonts YES
#endif
#ifndef Build100DpiFonts
-#define Build100DpiFonts YES
+# define Build100DpiFonts YES
#endif
#ifndef BuildSpeedoFonts
-#define BuildSpeedoFonts YES
+# define BuildSpeedoFonts YES
#endif
#ifndef BuildType1Fonts
-#define BuildType1Fonts YES
+# define BuildType1Fonts YES
#endif
#ifndef BuildCIDFonts
-#define BuildCIDFonts YES
+# define BuildCIDFonts YES
#endif
#ifndef BuildCyrillicFonts
-#define BuildCyrillicFonts YES
+# define BuildCyrillicFonts YES
#endif
#ifndef BuildLatin2Fonts
-#define BuildLatin2Fonts YES
+# define BuildLatin2Fonts YES
#endif
#ifndef UseKoi8RForCyrillic
-#define UseKoi8RForCyrillic YES
+# define UseKoi8RForCyrillic YES
#endif
/*
* By default, create the local font directory
*/
#ifndef MakeLocalFontDir
-#define MakeLocalFontDir YES
+# define MakeLocalFontDir YES
#endif
/*
* Build scanpci?
*/
#ifndef BuildScanpci
-#if SystemV || SystemV4 || \
+# if SystemV || SystemV4 || \
(defined(LinuxArchitecture) && !defined(Mc68020Architecture) && \
!defined(PpcArchitecture)) || \
defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \
defined(OS2Architecture)
-#define BuildScanpci YES
-#else
-#define BuildScanpci NO
-#endif
+# define BuildScanpci YES
+# else
+# define BuildScanpci NO
+# endif
#endif
#ifndef CompressAllFonts
-#define CompressAllFonts YES
+# define CompressAllFonts YES
#endif
#ifndef GzipFontCompression
-#define GzipFontCompression YES
+# define GzipFontCompression YES
#endif
#ifndef StripInstalledPrograms
-#define StripInstalledPrograms YES
+# define StripInstalledPrograms YES
#endif
#ifndef InstallJapaneseDocs
@@ -767,52 +782,52 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#endif
#if BuildXF86DGA
-#define XFree86DGADefines -DXFreeXDGA
+# define XFree86DGADefines -DXFreeXDGA
#else
-#define XFree86DGADefines /**/
+# define XFree86DGADefines /**/
#endif
#if BuildXvExt
-#define XFree86XvDefines -DXvExtension
+# define XFree86XvDefines -DXvExtension
#else
-#define XFree86XvDefines /**/
+# define XFree86XvDefines /**/
#endif
#ifndef DlopenHack
-#define DlopenHack -DDLOPEN_HACK
+# define DlopenHack -DDLOPEN_HACK
#endif
#ifndef LoaderDefines
-#if MakeDllModules
-#define ExtraLoaderDefines DlopenHack
-#else
-#define ExtraLoaderDefines /**/
-#endif
+# if MakeDllModules
+# define ExtraLoaderDefines DlopenHack
+# else
+# define ExtraLoaderDefines /**/
+# endif
#endif
#if DoLoadableServer
-#define XFree86LoaderDefines -DXFree86LOADER ExtraLoaderDefines
+# define XFree86LoaderDefines -DXFree86LOADER ExtraLoaderDefines
#else
-#define XFree86LoaderDefines /**/
+# define XFree86LoaderDefines /**/
#endif
#ifndef MakeHasPosixVariableSubstitutions
-#if !HasBsdMake && !defined(SunArchitecture)
-#define MakeHasPosixVariableSubstitutions NO
-#else
-#define MakeHasPosixVariableSubstitutions YES
-#endif
+# if !HasBsdMake && !defined(SunArchitecture)
+# define MakeHasPosixVariableSubstitutions NO
+# else
+# define MakeHasPosixVariableSubstitutions YES
+# endif
#endif
#if !HasSnprintf
-#define ServerSnprintfDefines -DNEED_SNPRINTF
+# define ServerSnprintfDefines -DNEED_SNPRINTF
#else
-#define ServerSnprintfDefines /**/
+# define ServerSnprintfDefines /**/
#endif
/* Server defines required for all OSs */
#ifndef XFree86ServerDefines
-#define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \
+# define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \
XFree86DGADefines XFree86XvDefines \
XFree86LoaderDefines -DXFree86Server \
VidModeExtensionDefines \
@@ -822,50 +837,59 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#endif
#ifndef XFree86ServerOSDefines
-#define XFree86ServerOSDefines -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
+# define XFree86ServerOSDefines -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
-DDDXOSVERRORF -DSMART_SCHEDULE
#endif
#ifndef XFree86ConsoleDefines
-#ifdef i386BsdArchitecture
-#define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT
-#else
-#define XFree86ConsoleDefines /**/
+# if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture)
+# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_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
+# define UseServerLock YES
#endif
#ifndef XnestServer
-#define XnestServer YES
+# define XnestServer YES
#endif
#ifndef XVirtualFramebufferServer
-#define XVirtualFramebufferServer YES
+# define XVirtualFramebufferServer YES
#endif
#ifndef XprtServer
-#define XprtServer YES
+# define XprtServer YES
#endif
#ifndef ServerExtraDefines
-#define ServerExtraDefines XFree86ServerDefines
+# define ServerExtraDefines XFree86ServerDefines
#endif
#ifndef ServerOSDefines
-#define ServerOSDefines XFree86ServerOSDefines
+# define ServerOSDefines XFree86ServerOSDefines
#endif
#ifndef DriverSDKDir
-#define DriverSDKDir $(USRLIBDIR)/Server
+# define DriverSDKDir $(USRLIBDIR)/Server
#endif
#ifndef DriverSDKModuleDir
-#define DriverSDKModuleDir $(USRLIBDIR)/Server/modules
+# define DriverSDKModuleDir $(USRLIBDIR)/Server/modules
#endif
#ifndef DriverSDKIncludeDir
-#define DriverSDKIncludeDir $(USRLIBDIR)/Server/include
+# define DriverSDKIncludeDir $(USRLIBDIR)/Server/include
#endif
DRIVERSDKDIR = DriverSDKDir
@@ -919,88 +943,88 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
*/
#ifndef AsmDefines
-#define AsmDefines /**/
+# define AsmDefines /**/
#endif
#ifndef OtherIConfigFiles
-#define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules
+# define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules
#endif
#ifndef XFree86Version
-#define XFree86Version 3917
+# define XFree86Version 3918
#endif
#ifndef XVendorString
-#define XVendorString "The XFree86 Project, Inc"
+# define XVendorString "The XFree86 Project, Inc"
#endif
#ifndef XVendorRelease
-#define XVendorRelease XFree86Version
+# define XVendorRelease XFree86Version
#endif
#ifndef UseRgbTxt
-#define UseRgbTxt YES
+# define UseRgbTxt YES
#endif
#ifndef ManSuffix
-#define ManSuffix 1
+# define ManSuffix 1
#endif
/*
* GNU Compiler stuff
*/
#ifndef HasGcc2
-#define HasGcc2 NO
+# define HasGcc2 NO
#endif
#ifndef HasGcc
-#define HasGcc HasGcc2
+# define HasGcc HasGcc2
#endif
#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus HasGcc2
+# define HasGcc2ForCplusplus HasGcc2
#endif
#if HasGcc
-#ifndef GccWarningOptions
-#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
+# ifndef GccWarningOptions
+# define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wredundant-decls -Wnested-externs
-#endif
-#ifndef DefaultCCOptions
-#if defined(UseInstalled)
-#define DefaultCCOptions /* -ansi */
-#else
-#define DefaultCCOptions -ansi -pedantic GccWarningOptions
-#endif
-#endif
-#if defined(UseInstalled)
-#ifndef UseGccMakeDepend
-#define UseGccMakeDepend YES
-#endif
-#endif
+# endif
+# ifndef DefaultCCOptions
+# if defined(UseInstalled)
+# define DefaultCCOptions /* -ansi */
+# else
+# define DefaultCCOptions -ansi -pedantic GccWarningOptions
+# endif
+# endif
+# if defined(UseInstalled)
+# ifndef UseGccMakeDepend
+# define UseGccMakeDepend YES
+# endif
+# endif
#endif
#if HasGcc2 && defined(i386Architecture)
-#ifndef DefaultGcc2i386Opt
-#define DefaultGcc2i386Opt -O2 -fno-strength-reduce
-#endif
+# ifndef DefaultGcc2i386Opt
+# define DefaultGcc2i386Opt -O2 -fno-strength-reduce
+# endif
#endif
#if HasGcc2 && defined(AlphaArchitecture)
-#ifndef DefaultGcc2AxpOpt
-#define DefaultGcc2AxpOpt -O2
-#endif
+# ifndef DefaultGcc2AxpOpt
+# define DefaultGcc2AxpOpt -O2
+# endif
#endif
#ifndef DefaultGcc2DebugOpt
-#define DefaultGcc2DebugOpt -g
+# define DefaultGcc2DebugOpt -g
#endif
#if HasGcc2 && DebuggableLibraries
-#define LibraryDebugOpt DefaultGcc2DebugOpt
+# define LibraryDebugOpt DefaultGcc2DebugOpt
#endif
#ifndef DontDefineXF86Contrib
-#define XF86Contrib
+# define XF86Contrib
#endif
#include <xf86.rules>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 15:43:55 +0000