Commit 856c9670 authored by dawes's avatar dawes
Browse files

Import of XFree86 4.0.2

parent de862f7f
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.85 2000/12/02 01:16:01 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86 2000/12/12 17:05:30 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -1297,8 +1297,8 @@ ProgramTargetName($(RMAN)): @@\
#ifndef BuildInstallHtmlManPage
#if BuildHtmlManPages
XCOMM Don't do: 'AllTarget(dest.suffix.html)'. It breaks external packages
#define BuildInstallHtmlManPage(file,dest,suffix) @@\
AllTarget(dest.suffix.html) @@\
@@\
dest.suffix.html: file.man RmanCmdDependency @@\
RemoveFiles(dest.suffix.html dest.suffix-html) @@\
......
/* $XFree86: xc/config/cf/TinyX.cf,v 1.1 2000/12/08 22:09:32 keithp Exp $ */
/*
* This configuration file contains additional configuration needed
* to compile a (nearly) minimal X server using the kdrive infrastructure
* To use this, add the following to host.def:
#define KDriveXServer YES
#define TinyXServer YES
*/
#define BuildLBX NO
#define BuildFonts NO
#define BuildAppgroup NO
#define BuildDBE NO
#define BuildXCSecurity NO
#define FontServerAccess NO
#undef BuildXF86RushExt
#define BuildXF86RushExt NO
#undef BuildRender
#define BuildRender YES
#define UseRgbTxt YES
#define BuildFontServer NO
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.86 2000/12/04 18:49:11 dawes Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $
/***************************************************************************
* *
......@@ -305,7 +305,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.86 2000/12/04 18:49:11 dawes Exp $
#define BuildRender NO
#endif
#ifndef BuildRenderLibrary
#define BuildRenderLibrary BuildRender
#define BuildRenderLibrary YES
#endif
#ifndef BuildXftLibrary
#define BuildXftLibrary BuildRenderLibrary
......@@ -321,6 +321,14 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.86 2000/12/04 18:49:11 dawes Exp $
#define BuildAllSpecsDocs NO
#endif
#ifndef InstallHardcopyDocs
#define InstallHardcopyDocs NO
#endif
#ifndef InstallMiscManPages
#define InstallMiscManPages NO
#endif
#ifndef FSUseSyslog
#define FSUseSyslog NO
#endif
......@@ -849,6 +857,31 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define PexCCOptions DefaultCCOptions
#endif
#endif
#ifndef MesaUseMMX
#ifdef HasMMXSupport
#define MesaUseMMX HasMMXSupport
#else
#define MesaUseMMX NO
#endif
#endif
#ifndef MesaUse3DNow
#ifdef Has3DNowSupport
#define MesaUse3DNow Has3DNowSupport
#else
#define MesaUse3DNow NO
#endif
#endif
#ifndef MesaUseKatmai
#ifdef HasKatmaiSupport
#define MesaUseKatmai HasKatmaiSupport
#else
#define MesaUseKatmai NO
#endif
#endif
#ifndef DefaultFSConfigFile
#define DefaultFSConfigFile $(LIBDIR)/fs/config
#endif
......@@ -2196,14 +2229,14 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir)
#endif
#ifndef Freetype2IncDir
#define Freetype2IncDir Freetype2Dir/include
#define Freetype2IncDir Freetype2Dir/include/freetype2
#endif
FREETYPE2DIR = Freetype2Dir
FREETYPE2LIBDIR = Freetype2LibDir
FREETYPE2INCDIR = Freetype2IncDir
FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
FREETYPE2LIB = -L$(FREETYPE2DIR)/lib -lfreetype
FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
FREETYPE2DEFINES = -DFREETYPE2
#endif
......@@ -2382,6 +2415,11 @@ InstallFontObjs($(OBJS),dest)
InstallTarget(install,fonts.alias,$(INSTDATFLAGS),dest)
#endif /* InstallFontAliases */
#ifndef InstallNamedFontAliases
#define InstallNamedFontAliases(src,dest) @@\
InstallNamedTarget(install,src,$(INSTDATFLAGS),dest,fonts.alias)
#endif /* InstallNamedFontAliases */
#ifndef FontSrc
#define FontSrc(basename) basename.bdf
#endif
......@@ -2682,3 +2720,19 @@ install:: deps @@\
#define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt)
#endif
#ifndef InstallHardcopyDoc
#define InstallHardcopyDoc(name,deps) @@\
all:: deps @@\
@if [ -f name.PS.gz ]; then set -x; \ @@\
RemoveFile(name.PS); \ @@\
gzip -d < name.PS.gz > name.PS; \ @@\
fi @@\
@@\
clean:: @@\
@if [ -f name.PS.gz ]; then set -x; \ @@\
RemoveFile(name.PS); \ @@\
fi @@\
@@\
InstallDoc(name,deps)
#endif
/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
/*
* This file contains redefinitions of some symbols to enable
* cross compilation: e.g. paths for include files and paths to
* compiler images. It will have to be edited to reflect these
* given your local configuration.
*/
#undef i386Architecture
#define Arm32Architecture
#undef OptimizedCDebugFlags
#define OptimizedCDebugFlags -O2
#define ServerCDebugFlags -O2
#undef StandardDefines
#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
#undef CcCmd
#define StdIncDir /skiff/local/arm-linux/include
#define PreIncDir
#undef PostIncDir
#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
#define CcCmd /skiff/local/bin/arm-linux-gcc
#define DoRanlibCmd YES
#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
#undef ExtraLoadFlags
#define ExtraLoadFlags
#define FbNoPixelAddrCode
#undef TermcapLibrary
#define TermcapLibrary -ltermcap
#undef LdPostLib
#define LdPostLib -L/skiff/local/arm-linux/lib
#undef ExtensionOSDefines
#define ExtensionOSDefines
#define ServerXdmcpDefines /**/
#include <cross.rules>
XCOMM $XFree86: xc/config/cf/cross.rules,v 1.2 2000/12/09 03:33:18 dawes Exp $
#define HostLinkRule(target, flags, src, libs) cc -I$(BUILDINCDIR) -o target src
/* ComplexHostProgramTarget - Compile a program such that we can run
* it on this host, i.e., don't use the default cross compiler.
*/
#ifndef ComplexHostProgramTarget
#define ComplexHostProgramTarget(program) @@\
CC=cc @@\
STD_INCLUDES= @@\
CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
EXTRA_LOAD_FLAGS= @@\
PROGRAM = program @@\
@@\
AllTarget(program) @@\
@@\
program: $(OBJS) $(DEPLIBS) @@\
RemoveTargetProgram($@) @@\
HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
@@\
DependTarget() @@\
@@\
LintTarget() @@\
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program))
#endif /* ComplexHostProgramTarget */
#ifndef SimpleHostProgramTarget
#define SimpleHostProgramTarget(program) @@\
SRCS = program.c @@\
@@\
CC=cc @@\
STD_INCLUDES= @@\
CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) @@\
EXTRA_LOAD_FLAGS= @@\
PROGRAM = program @@\
@@\
AllTarget(program) @@\
@@\
program: program.o $(DEPLIBS) @@\
RemoveTargetProgram($@) @@\
HostLinkRule($@,$(_NOOP_),program.o,$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
@@\
DependTarget() @@\
@@\
LintTarget() @@\
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program))
#endif /* SimpleHostProgramTarget */
XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.7 2000/09/26 04:26:30 keithp Exp $
XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.8 2000/12/08 22:09:39 keithp Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
......@@ -28,8 +28,8 @@ XCOMM $XConsortium: $
#ifndef XItsyServer
#define XItsyServer NO
#endif
#ifndef XiPAQH3600Server
#define XiPAQH3600Server NO
#ifndef TinyXServer
#define TinyXServer NO
#endif
#ifndef XvesaServer
#define XvesaServer NO
......@@ -39,8 +39,12 @@ XCOMM $XConsortium: $
#include <itsy.cf>
#endif
#if XiPAQH3600Server
#include <iPAQH3600.cf>
#if TinyXServer
#include <TinyX.cf>
#endif
#if CrossCompiling
#include <cross.def>
#endif
#define XprtServer NO
......
......@@ -4,7 +4,7 @@ XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.150 2000/12/02 19:06:57 herrb Exp $
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.157 2000/12/14 17:00:46 dawes Exp $
#ifndef LinuxElfDefault
# define LinuxElfDefault YES
......@@ -87,7 +87,9 @@ XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyV
XCOMM binutils: (LinuxBinUtilsMajorVersion)
#if LinuxDistribution == LinuxDebian
#define XFree86Devel YES
#ifdef DebianMaintainer
#define XFree86Devel YES
#endif
#define HasTk YES
#define TkLibDir /usr/lib
#define TkIncDir /usr/include
......@@ -98,32 +100,44 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define TclIncDir /usr/include
#define TclLibName tcl8.3
#define XF86SetupUsesStaticTcl NO
#if 0
#define XInputDrivers mouse dynapro elo2300 elographics magellan microtouch \
mutouch spaceorb wacom void
#endif
/* un-comment this when it is un-broken */
/* #define JoystickSupport YES */
#define InstallXinitConfig YES
#define InstallXdmConfig YES
#define InstallFSConfig YES
#if 0
#ifdef DebianMaintainer
#define HasXdmAuth YES
#endif
#define DebuggableLibraries YES
#define ForceNormalLib YES
#define BuildSpecsDocs YES
#define SpecsDocDirs GL Xext Xv xterm
#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
/* right now glide only works on i386 */
#ifdef i386Architecture
# define HasGlide2 YES
# define Glide2IncDir /usr/include/glide
# define HasGlide3 YES
# define Glide3IncDir /usr/include/glide3
#ifdef DebianMaintainer
#define HasGlide2 YES
#endif
#define Glide2IncDir /usr/include/glide
#ifdef DebianMaintainer
#define HasGlide3 YES
#endif
#define Glide3IncDir /usr/include/glide3
#endif
#define XAppLoadDir EtcX11Directory/app-defaults
#define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
#ifdef DebianMaintainer
/* the relative symlink created by this rule causes problems for us */
#if InstallAppDefFiles
#define InstallAppDefaultsLong(file,class) @@\
InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#else
#define InstallAppDefaultsLong(file,class) @@\
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#endif /* InstallAppDefFiles */
#endif
#ifdef DebianMaintainer
#define BuilderEMailAddr "submit@bugs.debian.org"
#endif
#define SharedLibXdmGreet YES
#define LinkGLToUsrInclude NO
#define LinkGLToUsrLib NO
......@@ -136,6 +150,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define BuildRman NO
#define BuildHtmlManPages NO
#define FSUseSyslog YES
#ifndef HasKatmaiSupport
#define HasKatmaiSupport NO
#endif
#endif
#if LinuxDistribution == LinuxRedHat
......@@ -244,7 +261,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# elif defined(AlphaArchitecture)
# define BuildXF86DRI YES
# elif defined(PpcArchitecture)
# define BuildXF86DRI YES
# define BuildXF86DRI NO
# else
# define BuildXF86DRI NO
# endif
......@@ -304,6 +321,40 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif
#endif
/*
* Support for MMX isn't present in the Assembler used in Red Hat 4.2, so
* don't enable it for libc5 as a reasonable default.
*/
#ifndef HasMMXSupport
# ifdef i386Architecture
# if (LinuxCLibMajorVersion > 5)
# define HasMMXSupport YES
# else
# define HasMMXSupport NO
# endif
# else
# define HasMMXSupport NO
# endif
#endif
/*
* Support for 3DNow isn't present in the Assembler used in Red Hat 4.2, so
* don't enable it for libc5 as a reasonable default.
*
* XXX This is preliminary.
*/
#ifndef Has3DNowSupport
# ifdef i386Architecture
# if (LinuxCLibMajorVersion > 5)
# define Has3DNowSupport YES
# else
# define Has3DNowSupport NO
# endif
# else
# define Has3DNowSupport NO
# endif
#endif
/*
* The Rush extension support.
*/
......
XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.19 2000/02/26 05:19:44 dawes Exp $
XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.22 2000/12/18 02:43:27 dawes Exp $
XCOMM
XCOMM Rules for formatting Linuxdoc-SGML documentation
XCOMM
......@@ -81,22 +81,28 @@ clean:: @@\
*/
#ifndef UpdateFormattedDoc
#define UpdateFormattedDoc(textfile) @@\
#define UpdateFormattedDoc(textfile,dstdir) @@\
update.docs:: textfile @@\
-@if [ -f $(FORMATTEDDIR)/textfile ]; then \ @@\
-@if [ -f dstdir/textfile ]; then \ @@\
if [ "$(FORCEUPDATE)" = yes ]; then set -x; \ @@\
cp textfile $(FORMATTEDDIR)/textfile; \ @@\
echo "" >> $(FORMATTEDDIR)/textfile; \ @@\
echo "\$$XFree86\$$" >> $(FORMATTEDDIR)/textfile; \ @@\
if [ "$(FOLLOWLINK)" = no ]; then \ @@\
$(RM) dstdir/textfile; \ @@\
fi; \ @@\
cp textfile dstdir/textfile; \ @@\
echo "" >> dstdir/textfile; \ @@\
echo "\$$XFree86\$$" >> dstdir/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 :; \ @@\
grep "Generated from XFree86:" dstdir/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; \ @@\
if [ "$(FOLLOWLINK)" = no ]; then \ @@\
$(RM) dstdir/textfile; \ @@\
fi; \ @@\
cp textfile dstdir/textfile ; \ @@\
echo "" >> dstdir/textfile; \ @@\
echo "\$$XFree86\$$" >> dstdir/textfile; \ @@\
fi; \ @@\
fi; \ @@\
fi @@\
......@@ -107,7 +113,7 @@ update.docs:: textfile @@\
LinuxDocSgmlToText(sgmlfile,textfile) @@\
LinuxDocSgmlToHtml(sgmlfile,base) @@\
LinuxDocSgmlToPs(sgmlfile,base) @@\
UpdateFormattedDoc(textfile)
UpdateFormattedDoc(textfile,$(FORMATTEDDIR))
#define LinuxDocReadmeTarget(base) @@\
LinuxDocTargetLong(base.sgml,ReadmeFile(base),base)
......
XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.39 2000/11/30 23:29:56 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.40 2000/12/14 17:13:05 dawes Exp $
#ifndef OSName
......@@ -48,6 +48,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifndef HasPosixRegex
#define HasPosixRegex NO
#endif
#ifndef HasPerl
#define HasPerl NO
#endif
#if OSMajorVersion == 3 && OSMinorVersion == 1
# ifndef UseSmartScheduler
# define UseSmartScheduler NO
......
......@@ -3,7 +3,7 @@ XCOMM platform: $TOG: sun.cf /main/176 1997/12/09 17:27:51 kaleb $
XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.53 2000/08/11 19:51:01 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.54 2000/12/11 22:34:21 dawes Exp $
#ifndef OSName
# define OSName DefaultOSName
......@@ -175,6 +175,15 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
# define HasPlugin YES
#endif
#ifndef HasPerl
/* Solaris 8 comes with perl. Earlier versions don't. */
# if (OSMajorVersion == 5) && (OSMinorVersion >= 8)
# define HasPerl YES
# else
# define HasPerl NO
# endif
#endif
#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
#if OSMajorVersion > 4
......
XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $
XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.41 2000/11/28 16:10:23 dawes Exp $
XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.42 2000/12/11 22:34:22 dawes Exp $
/*
* A default OS name
*/
......@@ -154,6 +154,10 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.41 2000/11/28 16:10:23 dawes Exp $
#define HasGcc HasGcc2
#endif
#ifndef HasPerl
#define HasPerl NO
#endif
#ifdef i386Architecture
#ifndef SunArchitecture
#if (OSMinorVersion > 2) || ((OSMinorVersion == 2) && (OSTeenyVersion >= 2))
......
......@@ -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.20 2000/10/24 18:07:34 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.21 2000/12/11 22:34:24 dawes Exp $
#ifndef OSName
# define OSName DefaultOSName
......@@ -61,6 +61,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
#endif
#define BuildLibPathVar LD_LIBRARY_PATH
/* UnixWare 7.x comes with perl. */
#ifndef HasPerl
# if OSMajorVersion >= 7
# define HasPerl YES
# else
# define HasPerl NO
# endif
#endif
#ifndef UseExportLists
# define UseExportLists YES
#endif
......
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.167 2000/11/28 20:59:12 dawes Exp $
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170 2000/12/14 16:38:45 dawes Exp $
/******************************************************************************/
/*
* This file is to provide a quick method for most people to change the
......@@ -252,7 +252,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.167 2000/11/28 20:59:12 dawes Exp
* modules will be built.
*
#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
neomagic i740 tdfx \
neomagic i740 tdfx savage \
cirrus tseng trident chips apm \
GlideDriver fbdev i128 \
ati AgpGartDrivers DevelDrivers ark cyrix \
......@@ -267,6 +267,48 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.167 2000/11/28 20:59:12 dawes Exp
#define XF86ExtraCardDrivers extradriver1 extradriver2 ...
*/
/*
* 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
*/
/*
* Build XAA. This can be disabled with:
*
......@@ -656,7 +698,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.167 2000/11/28 20:59:12 dawes Exp
* the docs that XFree86 has changed or added.
*
#define BuildSpecsDocs YES
#define SpecsDocDirs GL Xext Xv xterm
#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xmu Xv i18n xterm
*/
/*
......
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.332 2000/12/04 18:49:13 dawes Exp $
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338 2000/12/14 16:59:06 dawes Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
......@@ -13,7 +13,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
*/
#ifndef XFree86Devel
# define XFree86Devel YES
# define XFree86Devel NO
#endif
#ifndef BuildDebug
......@@ -78,15 +78,45 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
#define GlideDriver /**/
#endif
/* Use the binary-only library from Matrox? */
#ifndef UseMatroxHal
#define UseMatroxHal NO
/*
* 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
*