Commit dc1f830c authored by jhartmann's avatar jhartmann
Browse files

Import of XFree86 4.0

parent 3033c9bf
This diff is collapsed.
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.64 2000/02/13 06:15:16 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.65 2000/03/05 16:59:00 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -1944,11 +1944,13 @@ LintLibReferences(varname,libname,libsource)
#if HasGcc || HasGcc2
#define LibObjCompile(dir,options) RemoveFiles($@ dir/$@) @@\
ClearmakeOSName \
$(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c -o dir/$@
$(CC) -c $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) \
options $*.c -o dir/$@
#else
#define LibObjCompile(dir,options) RemoveFiles($@ dir/$@) @@\
ClearmakeOSName \
$(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c @@\
$(CC) -c $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) \
options $*.c @@\
$(MV) $@ dir/$@
#endif
#endif
......@@ -1957,11 +1959,13 @@ LintLibReferences(varname,libname,libsource)
#if HasGcc || HasGcc2
#define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@) @@\
ClearmakeOSName \
$(CXX) -c $(CXXOPTIONS) $(CXXDEFINES) options $*.CCsuf -o dir/$@
$(CXX) -c $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) \
options $*.CCsuf -o dir/$@
#else
#define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@) @@\
ClearmakeOSName \
$(CXX) -c $(CXXOPTIONS) $(CXXDEFINES) options $*.CCsuf @@\
$(CXX) -c $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) \
options $*.CCsuf @@\
$(MV) $@ dir/$@
#endif
#endif
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.65 2000/01/31 19:33:18 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.70 2000/03/07 14:31:34 dawes Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -132,6 +132,12 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasGnuMake
#define HasGnuMake NO
#endif
/*
* The following fixes a glitch with GNU make -j
*/
#ifndef ForceServerRemake
#define ForceServerRemake HasGnuMake
#endif
#ifndef HasBsdMake
#define HasBsdMake NO
#endif
......@@ -295,6 +301,8 @@ XCOMM the platform-specific parameters - edit site.def to change
#define ByteOrder X_BIG_ENDIAN
#elif defined(i386Architecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(ia64Architecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(SparcArchitecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(AlphaArchitecture)
......@@ -331,7 +339,7 @@ XCOMM the platform-specific parameters - edit site.def to change
#define HasKrb5 NO /* if you have Kerberos V5 */
#endif
#ifndef HasLatex
#define HasLatex YES
#define HasLatex NO
#endif
#ifndef HasShm
#if SystemV || SystemV4
......@@ -407,17 +415,28 @@ NCURSESLIBDIR = NCursesLibDir
#ifdef NCursesIncDir
NCURSESINCDIR = NCursesIncDir
#endif
#ifndef HasGlide
#define HasGlide NO
#ifndef HasGlide2
#define HasGlide2 NO
#endif
#ifndef Glide2IncDir
#if HasGlide2
#define Glide2IncDir /usr/include/glide
#else
#define Glide2IncDir
#endif
#endif
GLIDE2INCDIR = Glide2IncDir
#ifndef HasGlide3
#define HasGlide3 NO
#endif
#ifndef GlideIncDir
#if HasGlide
#define GlideIncDir /usr/include/glide
#ifndef Glide3IncDir
#if HasGlide3
#define Glide3IncDir /usr/include/glide3
#else
#define GlideIncDir
#define Glide3IncDir
#endif
#endif
GLIDEINCDIR = GlideIncDir
GLIDE3INCDIR = Glide3IncDir
#ifndef HasTk
#define HasTk NO
#endif
......@@ -610,7 +629,7 @@ TCLIBDIR = TclLibDir
#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX)
#endif
#ifndef ExtraManDefs
#define ExtraManDefs /**/
#define ExtraManDefs -D__projectroot__=$(PROJECTROOT)
#endif
#ifndef LogDirectory
......
......@@ -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.79 2000/02/21 18:05:30 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.80 2000/02/29 03:08:55 dawes Exp $
#ifndef OSName
......@@ -242,7 +242,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
* Make & install Features
*/
#define HasBsdMake YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
#define GzipFontCompression YES
#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR)
......
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.27 2000/02/11 18:06:37 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.30 2000/03/07 01:30:40 dawes Exp $
XCOMM
XCOMM $OpenBSD: OpenBSD.cf,v 1.33 1998/09/27 04:52:48 rahnds Exp $
XCOMM
......@@ -47,6 +47,20 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasVarRun YES
#define HasVarDb YES
/*
* Multi-thread safe libs
*/
#if OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3
#define HasPosixThreads YES
#define ThreadedX YES
#define BuildThreadStubLibrary YES
#define NeedUIThrStubs YES
#define HasThreadSafeAPI YES
#define SystemMTDefines -D_REENTRANT
#define ThreadsCompileFlags -pthread
#define ThreadsLibraries -lc_r
#endif
/*
* Compiler Features
*/
......@@ -142,7 +156,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasBsdMake YES
#define StripInstalledPrograms YES
#define BuildCyrillicFonts YES
#define GzipFontCompression YES
#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR)
......@@ -265,13 +278,6 @@ install:: fonts.alias @@\
$(RM) _fonts.alias
#endif /* InstallFontAliasesNoComment */
/* We now only use the XFree86 tree - thus we can define this
* independent of the architecture
*/
#ifndef XF86Contrib
#define XF86Contrib
#endif
/*
* Architecture specific sections - put all architecture dependent
* options and setting here into the correct section
......@@ -329,7 +335,7 @@ install:: fonts.alias @@\
/* 2.7 and later will have support for setting MTRRs */
#ifndef HasMTRRSupport
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6)
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6)
#define HasMTRRSupport YES
#else
#define HasMTRRSupport NO
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.59 2000/02/18 16:23:07 dawes Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.62 2000/03/02 17:52:50 dawes Exp $
/***************************************************************************
* *
......@@ -206,6 +206,9 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.59 2000/02/18 16:23:07 dawes Exp $
#ifndef BuildXinerama
#define BuildXinerama NO
#endif
#ifndef BuildXineramaLibrary
#define BuildXineramaLibrary BuildXinerama
#endif
#ifndef BuildXCSecurity
#define BuildXCSecurity YES
#endif
......@@ -1338,6 +1341,22 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
#endif
#endif
#if BuildXineramaLibrary
#ifndef SharedLibXinerama
#define SharedLibXinerama NO
#endif
#ifndef NormalLibXinerama
#define NormalLibXinerama YES
#endif
#ifndef DebugLibXinerama
#define DebugLibXinerama NO
#endif
#ifndef ProfileLibXinerama
#define ProfileLibXinerama NO
#endif
#endif
#if BuildDPSLibrary
#ifndef SharedLibDps
#define SharedLibDps HasSharedLibraries
......@@ -1513,6 +1532,18 @@ ProjectUnsharedLibReferences(XV,Xv,$(XVLIBSRC),XBuildLibDir)
#endif
#endif
#if BuildXineramaLibrary
XINERAMALIBSRC = $(LIBSRC)/Xinerama
#if SharedLibXinerama
#ifndef SharedXineramaRev
#define SharedXineramaRev 1.0
#endif
SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
#else
ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
#endif
#endif
#if BuildDPSLibrary
DPSLIBSRC = $(LIBSRC)/dps
#if SharedLibDps
......@@ -2373,7 +2404,7 @@ clean:: @@\
#ifndef MakeSimpleDoc
#define MakeSimpleDoc(file,srcs) @@\
all:: file.PS @@\
all:: file.PS file.txt @@\
.PRECIOUS: file.PS @@\
@@\
file.PS: srcs @@\
......@@ -2390,7 +2421,7 @@ clean:: @@\
#ifndef MakeTblDoc
#define MakeTblDoc(file,srcs) @@\
all:: file.PS @@\
all:: file.PS file.txt @@\
.PRECIOUS: file.PS @@\
@@\
file.PS: srcs @@\
......@@ -2407,7 +2438,7 @@ clean:: @@\
#ifndef MakeEqnDoc
#define MakeEqnDoc(file,srcs) @@\
all:: file.PS @@\
all:: file.PS file.txt @@\
.PRECIOUS: file.PS @@\
@@\
file.PS: srcs @@\
......@@ -2460,7 +2491,7 @@ file.PS: src @@\
#endif /* MakeLatexDoc */
#ifndef InstallDoc
#define InstallDoc(name,deps) @@\
#define InstallDoc(name,deps) @@\
install:: deps @@\
MakeDir($(DESTDIR)$(DOCPSDIR)) @@\
@if [ -f name.PS ]; then set -x; \ @@\
......@@ -2473,5 +2504,6 @@ install:: deps @@\
#endif
#ifndef InstallRoffDoc
#define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt)
#endif
XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.4 1999/03/21 01:44:58 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.6 2000/02/29 15:24:13 tsi Exp $
#ifndef OSName
#define OSName GNU
......@@ -97,7 +97,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define NeedNestedPrototypes YES
#define NeedVarargsPrototypes YES
#define NeedWidePrototypes NO
#define StripInstalledPrograms YES
#ifndef HasLibCrypt
# define HasLibCrypt YES
#endif
......@@ -121,7 +120,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#define BuildXTrueType NO
#define BuildXTT NO
#ifdef i386Architecture
# include <xfree86.cf>
......
XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.115 2000/02/21 18:05:31 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.119 2000/03/03 01:11:05 mvojkovi Exp $
#ifndef LinuxElfDefault
#define LinuxElfDefault YES
......@@ -119,11 +119,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
LinuxAdditionalIncludes LinuxGnuSourceDefines \
LinuxLocaleDefines
#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
#ifndef ia64Architecture
#define HasPosixThreads YES
#define ThreadedX YES
#define HasThreadSafeAPI YES
#define ThreadsLibraries -lpthread
#define SystemMTDefines -D_REENTRANT
#endif /* ia64Architecture */
#ifndef HasLibCrypt
#define HasLibCrypt YES
#endif
......@@ -159,6 +161,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifndef XF86INT10_BUILD
# ifdef i386Architecture
# define XF86INT10_BUILD X86VM
# elif defined(ia64Architecture)
# define UseX86Emu NO
# define XF86INT10_BUILD XF86INT10_STUB
# elif defined(X86EMU_LIBPATH)
# define XF86INT10_BUILD X86EMU_GENERIC
# endif
......@@ -207,6 +212,16 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# endif
#endif
#ifndef HasAgpGart
# ifdef i386Architecture
/* The AGPGART header file is included in os-support/linux, which
allows all drivers that depend on AGP to build properly. */
# define HasAgpGart YES
# else
# define HasAgpGart NO
# endif
#endif
/*
* The Rush extension support.
*/
......@@ -256,7 +271,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define AvoidNullMakeCommand YES
#define DebuggableLibraries YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
#define Malloc0ReturnsNull YES
#define NeedConstPrototypes YES
......@@ -316,6 +330,14 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define LdCmd /usr/alpha-linuxecoff/bin/ld -m alpha
#define AsmDefines -DUSE_GAS -U__ELF__
#endif /* AlphaArchitecture */
#ifdef ia64Architecture
#define CcCmd gcc
#define CplusplusCmd g++
#define AsCmd as
#define LdCmd ld
#define AsmDefines -DUSE_GAS -U__ELF__
#define HasSharedLibraries NO
#endif /* ia64Architecture */
#ifdef i386Architecture
#define CcCmd gcc -b i486-linuxaout
#define CplusplusCmd g++ -b i486-linuxaout
......@@ -340,6 +362,14 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define AsmDefines -D__ELF__
#define CplusplusCmd c++ -b alpha-linux
#endif /* AlphaArchitecture */
#ifdef ia64Architecture
#define CcCmd gcc
#define CplusplusCmd g++
#define AsCmd as
#define LdCmd ld
#define AsmDefines -D__ELF__
#define HasSharedLibraries NO
#endif /* ia64Architecture */
#ifdef i386Architecture
#define CcCmd gcc -b i486-linux
#define AsCmd /usr/i486-linux/bin/as
......@@ -384,10 +414,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define HasVarRun YES
#define VarDbDirectory /var/state
#ifndef HasAgpGart
#define HasAgpGart NO
#endif
#ifndef XF86ExtraCardDrivers
#define XF86ExtraCardDrivers v4l
#endif
......@@ -410,6 +436,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AlphaArchitecture */
#ifdef ia64Architecture
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__ia64__
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* ia64Architecture */
#ifdef Mc68020Architecture
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__mc68000__
......
XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.18 2000/01/25 01:36:53 dawes Exp $
XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.19 2000/02/26 05:19:44 dawes Exp $
XCOMM
XCOMM Rules for formatting Linuxdoc-SGML documentation
XCOMM
......@@ -83,7 +83,7 @@ clean:: @@\
#ifndef UpdateFormattedDoc
#define UpdateFormattedDoc(textfile) @@\
update.docs:: textfile @@\
@if [ -f $(FORMATTEDDIR)/textfile ]; then \ @@\
-@if [ -f $(FORMATTEDDIR)/textfile ]; then \ @@\
if [ "$(FORCEUPDATE)" = yes ]; then set -x; \ @@\
cp textfile $(FORMATTEDDIR)/textfile; \ @@\
echo "" >> $(FORMATTEDDIR)/textfile; \ @@\
......
......@@ -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.11 2000/01/25 18:37:30 dawes Exp $
XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.12 2000/02/29 03:08:56 dawes Exp $
#ifndef HasGcc
#define HasGcc YES
......@@ -61,10 +61,6 @@ XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.11 2000/01/25 18:37:30 dawes Exp $
# define HasSymLinks NO
#endif
#ifndef StripInstalledPrograms
# define StripInstalledPrograms YES
#endif
#ifndef MotifBC
# define MotifBC YES
#endif
......
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.159 2000/03/07 15:23:00 dawes Exp $
/******************************************************************************/
/*
* This file is to provide a quick method for most people to change the
......@@ -25,6 +25,13 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
#define InstallEmptyHostDef
*/
/*
* If you want to enable some developer settings, like more verbose
* compiler warnings, uncomment this.
*
#define XFree86Devel YES
*/
/*
* If using GCC 2.x on a system where it isn't the default, uncomment
* the following
......@@ -327,7 +334,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
* To disable support for TrueType fonts, uncomment these.
*
#define BuildFreeType NO
#define BuildXTT NO
#define BuildXTrueType NO
*/
/*
......@@ -402,8 +409,8 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
/*
* Select the XInput devices you want by uncommenting this.
*
#define XInputDrivers dynapro elo2300 elographics magellan microtouch \
mutouch spaceorb wacom
#define XInputDrivers mouse dynapro elo2300 elographics magellan microtouch \
mutouch spaceorb wacom void
*/
/*
......@@ -628,25 +635,45 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
*/
/*
* By default, XF86Contrib is defined so build only those parts of
* of the contrib distribution supported by XFree86. To prevent this
* from being defined, uncomment the following.
* To build/install X specs docs, uncomment the following.
* The SpecsDocDirs setting here is recommended because it covers
* the docs that XFree86 has changed or added.
*
#define BuildSpecsDocs YES
#define SpecsDocDirs GL Xext Xv xterm
*/
/*
* To build all specs docs, not just those listed in SpecsDocDirs, uncomment
* the following.
*
#define DontDefineXF86Contrib
#define BuildAllSpecsDocs YES
*/
/*
* To enable building the glide driver, you need to define
* HasGlide to YES and set the GlideIncDir variable.
* HasGlide is per default NO.
* HasGlide2 to YES and set the Glide2IncDir variable.
* HasGlide2 is per default NO.
*
#define HasGlide YES
#define HasGlide2 YES
*/
/*
* Set the path to your Glide include files.
*
#define GlideIncDir /usr/include/glide
#define Glide2IncDir /usr/include/glide
*/
/*
* The 3Dfx 3D DRI driver requires glide 3.
*
#define HasGlide3 YES
*/
/*
* Set the path to your Glide 3 include files.
*
#define Glide3IncDir /usr/include/glide3
*/
/*
......@@ -655,3 +682,5 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.153 1999/12/03 19:17:17 eich Exp $
*
#define X86EMU_LIBPATH /usr/local/lib
*/
<
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.269 2000/02/17 13:50:02 dawes Exp $
XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.282 2000/03/07 14:31:36 dawes Exp $
/*
* This configuration file contains all of the configuration
* information for the XFree86 based X Servers.
......@@ -8,6 +8,14 @@ XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.269 2000/02/17 13:50:02 dawes Exp $
*/
XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
/*
* This enables some settings for developers.
*/
#ifndef XFree86Devel
# define XFree86Devel NO
#endif
/*
* settings for the config file parser
*/
......@@ -26,10 +34,10 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
/* XInput drivers */
#ifndef XInputDrivers
#if 1
#define XInputDrivers dynapro microtouch wacom
#define XInputDrivers mouse dynapro microtouch wacom void
#else
#define XInputDrivers dynapro elo2300 elographics magellan \
microtouch mutouch spaceorb wacom
#define XInputDrivers mouse dynapro elo2300 elographics magellan \
microtouch mutouch spaceorb wacom void
#endif
#endif
......@@ -38,8 +46,13 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
#define XF86ExtraCardDrivers /**/
#endif
/* OS.cf files may set this for OS-specific drivers */
#ifndef HasAgpGart
#define HasAgpGart NO
#endif
/* The glide driver only works for the loadable server at the moment */
#if HasGlide && DoLoadableServer
#if HasGlide2 && DoLoadableServer
#define GlideDriver glide
#else
#define GlideDriver /**/
......@@ -140,6 +153,86 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $
# endif
#endif
/* IA-64 */
#ifdef ia64Architecture
# ifndef XF86Server
# define XF86Server YES
# endif
/* 1bpp module */
# ifndef XF1Bpp
# define XF1Bpp YES
# endif
/* 4bpp module */
# ifndef XF4Bpp
# define XF4Bpp YES
# endif
/* 8/32bpp overlay module */
# ifndef XF8_32Bpp
# define XF8_32Bpp YES
# endif
/* 8/16bpp dual fb module */
# ifndef XF8_16Bpp
# define XF8_16Bpp YES
# endif
/* 24/32bpp conversion module */
# ifndef XF24_32Bpp
# define XF24_32Bpp YES
# endif
/* shadow fb module */
# ifndef XFShadowFB
# define XFShadowFB YES
# endif
/* vgahw module */
# ifndef XF86VgaHw
# define XF86VgaHw YES
# endif
/* fbdevhw module */
# ifndef XF86FBDevHw
# define XF86FBDevHw YES
# endif
/* XAA module */
# ifndef XF86XAA
# define XF86XAA YES
# endif
/* ramdac module */
# ifndef XF86Ramdac
# define XF86Ramdac YES
# endif
/* I2C module */
# ifndef XF86I2C
# define XF86I2C YES
# endif
/* DDC module */
# ifndef XF86DDC
# define XF86DDC YES
# endif
/* RAC (Resource Access Control) module */
# ifndef XF86RAC