Commit 4a947efe authored by alanh's avatar alanh
Browse files

Import of XFree86 4.0.1

parent 13f3c1ec
This diff is collapsed.
XCOMM $TOG: Imakefile /main/138 1997/12/29 16:37:30 kaleb $
XCOMM $XFree86: xc/Imakefile,v 3.17 1998/10/06 09:55:46 dawes Exp $
XCOMM $XFree86: xc/Imakefile,v 3.19 2000/05/31 15:02:54 eich Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......@@ -199,6 +199,10 @@ xmakefile-exists::
#define MakeManKeywords YES /* install.man rebuilds "man -k" database? */
#endif
#ifndef MakeHtmlManIndex
#define MakeHtmlManIndex YES /* install.man generates HTML man page index */
#endif
#undef BootstrapCleanSubdirs
#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
BOOTSTRAPSUBDIRS = imake makedepend
# $TOG: Makefile /main/37 1998/02/17 14:30:04 kaleb $
# $XFree86: xc/Makefile,v 3.15 1999/08/14 10:48:56 dawes Exp $
# $XFree86: xc/Makefile,v 3.16 2000/03/22 21:23:30 dawes Exp $
# Luna users will need to either run make as "make MAKE=make"
# or add "MAKE = make" to this file.
......@@ -91,7 +91,7 @@ depend.bootstrap: $(DEPENDSRC)/Makefile.proto
cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap
$(IMAKESRC)/Makefile.proto: depend.bootstrap
$(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC)
$(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC) -DBootStrap
imake.bootstrap: $(IMAKESRC)/Makefile.proto
cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend
......
......@@ -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.91 2000/02/15 13:51:38 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.95 2000/06/23 19:50:58 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -29,7 +29,15 @@ XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.91 2000/02/15 13:51:38 da
#ifndef OSTeenyVersion
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
#ifndef OSRelVersion
/* Include this to get finer-grained information about the OS version */
#include "/usr/include/osreldate.h"
#define OSRelVersion __FreeBSD_version
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OsRelVersion)
#define HasGcc YES
#define HasGcc2 YES
......@@ -86,7 +94,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#ifndef ExtraLibraries
/* support for multi-byte locales is in libxpg4 rather than libc */
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
#if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \
!(OSMajorVersion == 4 && OSRelVersion >= 400020) && \
!(OSRelVersion >= 500005)
#define ExtraLibraries -lxpg4
#else
#define ExtraLibraries /**/
......@@ -115,6 +125,16 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#endif
/*
* Drivers that don't need AGP can work with 4.0, but we don't have a
* mechanism for specifying a subset of drivers in the OS.cf files yet.
*/
#ifndef BuildXF86DRI
#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
#define BuildXF86DRI YES
#endif
#endif
/*
* This doesn't work the way it does on every other system. On FreeBSD it's
* only a "hint, not a demand", whatever that means. Note that this is not
......@@ -382,6 +402,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifndef InstallManPageLong
#define InstallManPageLong(file,destdir,dest) @@\
BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
@@\
install.man:: file.man @@\
MakeDir($(DESTDIR)destdir) @@\
$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\
......@@ -392,6 +414,8 @@ install.man:: file.man @@\
#ifndef InstallGenManPageLong
#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
BuildInstallHtmlManPage(file,dest,suffix) @@\
@@\
install.man:: file.man @@\
MakeDir($(DESTDIR)destdir) @@\
$(RM) $(DESTDIR)destdir/dest.suffix* @@\
......@@ -418,8 +442,8 @@ install.man:: list @@\
/*
* InstallManPageAliases - install soft links for aliases.
*/
#ifndef InstallManPageAliases
#define InstallManPageAliases(file,destdir,aliases) @@\
#ifndef InstallManPageAliasesBase
#define InstallManPageAliasesBase(file,destdir,aliases) @@\
install.man:: @@\
@(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\
for i in aliases; do (set -x; \ @@\
......@@ -429,12 +453,22 @@ install.man:: @@\
done)
#endif
#ifndef InstallManPageAliases
#define InstallManPageAliases(file,destdir,aliases) @@\
InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
@@\
InstallManPageAliasesBase(file,destdir,aliases)
#endif
/*
* InstallGenManPageAliases - install soft links for aliases.
*/
#ifndef InstallGenManPageAliases
#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
InstallManPageAliases(file,destdir,aliases)
InstallHtmlManPageAliases(file,aliases,suffix) @@\
@@\
InstallManPageAliasesBase(file,destdir,aliases)
#endif
#endif
......@@ -464,7 +498,7 @@ install.man:: @@\
* 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
#if OSMajorVersion >= 4
#define FreeBSDGccOptBug
#endif
......
......@@ -17,7 +17,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.58 2000/06/30 17:15:05 dawes Exp $
#if defined(clipper) || defined(__clipper__)
# undef clipper
......@@ -53,10 +53,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
# define MacroIncludeFile <bsdi.cf>
# define MacroFile bsdi.cf
# undef bsdi
# define BSD386Architecture
# define i386BsdArchitecture
# define i386Architecture
# undef i386
# define BSDOSArchitecture
# if defined(__i386__) || defined(i386)
# define i386BsdArchitecture
# define i386Architecture
# undef i386
# undef __i386__
# endif
# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
# define SparcArchitecture
# undef sparc
# undef __sparc__
# undef __sparc_v9__
# endif
#endif /* bsdi */
#ifdef __OpenBSD__
......@@ -332,6 +341,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
# undef sgi
# define SGIArchitecture
# undef mips
# undef __mips
# define MipsArchitecture
# ifdef _SVR4
# undef _SVR4
......@@ -562,6 +572,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
# ifdef i386
# define i386Architecture
# undef i386
XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# undef i486
# undef i586
# undef i686
# endif /* i386 */
# ifdef __i386__
# ifndef i386Architecture
......@@ -603,6 +617,21 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
# endif
# undef __sparc__
# endif
# ifdef ia64
# define ia64Architecture
# undef ia64
# endif
# ifdef __ia64__
# ifndef ia64Architecture
# define ia64Architecture
# endif
# undef __ia64__
# endif
# if defined(mips) || defined(__mips__)
# define MipsArchitecture
# undef mips
# undef __mips__
# endif
/* for compatibility with 3.3.x */
# ifdef PpcArchitecture
# define PowerPCArchitecture
......@@ -748,6 +777,12 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.53 2000/02/12 20:45:01 dawes Exp $
#endif
#endif /* QNX/Neutrino */
#ifdef SparcArchitecture
# if defined(__sparc_v9) || defined(__arch64__)
# define Sparc64Architecture
# endif
#endif
#ifndef MacroIncludeFile
XCOMM WARNING: Imake.cf not configured; guessing at definitions!!!
XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.65 2000/03/05 16:59:00 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.76 2000/06/15 20:49:55 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -127,6 +127,7 @@ XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.65 2000/03/05 16:59:00 dawe
* SpecialObjectRule (objs,depends,options)
* SpecialCObjectRule (basename,depends,options)
* LexFile (file)
* M4File (file,includes)
* YaccFile (file,flags)
* YaccFileNoFlags (file)
* MakeLibrary (libname,objlist)
......@@ -1137,6 +1138,17 @@ install:: LibraryTargetName(libname) @@\
#endif
/*
* InstallDriverSDKLibraryModule - rule to install Driver SDK library module.
* (only used for XFree86). This is a no-op
* rule so that Imakefiles on non-XFree86 systems
* continue to build Makefiles correctly.
*/
#ifndef InstallDriverSDKLibraryModule
#define InstallDriverSDKLibraryModule(lib,dlib,dir)
#endif
/*
* MergeIntoInstalledLibrary - generate rules to merge one library into another
*/
......@@ -1177,6 +1189,8 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest)
*/
#ifndef InstallManPageLong
#define InstallManPageLong(file,destdir,dest) @@\
BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
@@\
InstallNamedTarget(install.man,file.man,$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
#endif /* InstallManPageLong */
......@@ -1195,6 +1209,8 @@ InstallManPageLong(file,destdir,file)
*/
#ifndef InstallManPageAliases
#define InstallManPageAliases(file,destdir,aliases) @@\
InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
@@\
install.man:: @@\
@(TMP=/tmp/tmp.$$$$; \ @@\
RemoveFile($${TMP}); \ @@\
......@@ -1212,6 +1228,8 @@ install.man:: @@\
*/
#ifndef InstallGenManPageLong
#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
BuildInstallHtmlManPage(file,dest,suffix) @@\
@@\
install.man:: file.man @@\
MakeDir($(DESTDIR)destdir) @@\
$(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix
......@@ -1232,6 +1250,8 @@ InstallGenManPageLong(file,destdir,file,suffix)
*/
#ifndef InstallGenManPageAliases
#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
InstallHtmlManPageAliases(file,aliases,suffix) @@\
@@\
install.man:: @@\
@(TMP=/tmp/tmp.$$$$; \ @@\
RemoveFile($${TMP}); \ @@\
......@@ -1242,6 +1262,82 @@ install.man:: @@\
RemoveFile($${TMP}))
#endif /* InstallGenManPageAliases */
/*
* RmanDependency - generate rules to build the rman program if
* this Imakefile is within the source tree.
*/
#ifndef RmanDependency
#ifdef UseInstalled
#define RmanDependency() /**/
#else
#define RmanDependency() @@\
NoCmpScript(ProgramTargetName($(RMAN))) @@\
@@\
ProgramTargetName($(RMAN)): @@\
@echo "checking $@ over in $(TOP)/config/util first..."; \ @@\
cd $(TOP)/config/util && $(MAKE) rman; \ @@\
echo "okay, continuing in $(CURRENT_DIR)"
#endif /* UseInstalled */
#endif /* RmanDependency */
#ifndef RmanCmdDependency
#ifdef UseInstalled
#define RmanCmdDependency /**/
#else
#define RmanCmdDependency ProgramTargetName($(RMAN))
#endif
#endif
#ifndef BuildInstallHtmlManPage
#if BuildHtmlManPages
#define BuildInstallHtmlManPage(file,dest,suffix) @@\
AllTarget(dest.suffix.html) @@\
@@\
dest.suffix.html: file.man RmanCmdDependency @@\
RemoveFiles(dest.suffix.html dest.suffix-html) @@\
RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) &&\ @@\
$(MV) dest.suffix-html $@ @@\
@@\
install.man:: dest.suffix.html @@\
MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
@(SUF=`expr dest.suffix.html \: '.*\.\(.\).*\.'`; \ @@\
set -x; \ @@\
$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) dest.suffix.html $(DESTDIR)$(DOCHTMLDIR)/dest.$$SUF.html) @@\
@@\
clean:: @@\
RemoveFiles(dest.suffix.html dest.suffix-html)
#else
#define BuildInstallHtmlManPage(file,dest,suffix) /**/
#endif
#endif
#ifndef InstallHtmlManPageAliases
#if BuildHtmlManPages
#define InstallHtmlManPageAliases(file,aliases,suffix) @@\
install.man:: file.suffix.html @@\
@for i in aliases; do (set -x; \ @@\
RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.suffix.html); \ @@\
(cd $(DESTDIR)$(DOCHTMLDIR); \ @@\
$(LN) file.suffix.html $$i.suffix.html)); \ @@\
done
#else
#define InstallHtmlManPageAliases(file,aliases,suffix) /**/
#endif
#endif
#ifndef HtmlManIndex
#if BuildHtmlManPages
#define HtmlManIndex @@\
html_index:: @@\
$(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR)
#else
#define HtmlManIndex html_index::
#endif
#endif
/*
* ManKeywordsTarget - generate the database used by "man -k".
* This rule updates the index in the directory "manpath", which
......@@ -2106,6 +2202,19 @@ clean:: @@\
RemoveFiles(lex.yy.c file.c)
#endif /* LexFile */
#ifndef M4File
#define M4File(file,includes) @@\
file: file.m4 includes @@\
RemoveFile(file) @@\
$(M4) $(M4FLAGS) file.m4 >file @@\
@@\
depend:: file @@\
@@\
clean:: @@\
RemoveFile(file)
#endif /* M4File */
#ifndef YaccFile
#if HasGnuMake
#define YaccFile(file,flags) @@\
......@@ -2669,6 +2778,9 @@ NamedTargetSubdirs(includes,dirs,including,NullParameter,includes)
#ifndef InstallDriverSDKObjectModule
#define InstallDriverSDKObjectModule(module,dest,subdir)
#endif
#ifndef InstallDriverSDKObjectSubModule
#define InstallDriverSDKObjectSubModule(module,dest,subdir)
#endif
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.70 2000/03/07 14:31:34 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.81 2000/06/25 20:17:28 dawes Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -102,15 +102,27 @@ XCOMM the platform-specific parameters - edit site.def to change
/* the following are needed before we can include Imake.rules */
#ifndef NothingOutsideProjectRoot
#define NothingOutsideProjectRoot NO
#endif
#ifndef HasVarDirectory
#define HasVarDirectory YES
#endif
#ifndef UseEtcX11
#define UseEtcX11 YES
#endif
#if NothingOutsideProjectRoot
#undef UseEtcX11
#define UseEtcX11 NO
#endif
#ifndef UseSeparateConfDir
#define UseSeparateConfDir (UseEtcX11 || HasVarDirectory)
#endif
#if NothingOutsideProjectRoot
#undef UseSeparateConfDir
#define UseSeparateConfDir NO
#endif
#ifndef SystemV
#define SystemV NO /* SYSV (R3) */
#endif
......@@ -174,6 +186,39 @@ XCOMM the platform-specific parameters - edit site.def to change
#define HasSymLinks YES
#endif
#ifndef BuildRman
#define BuildRman YES
#endif
#ifndef RmanCmd
#if BuildRman
#ifdef UseInstalled /* assume BINDIR in path */
#define RmanCmd rman
#else
#define RmanCmd $(TOP)/config/util/rman
#endif
#endif
#endif
#ifndef RmanOptions
#if BuildRman
#define RmanOptions -f HTML
#endif
#endif
#ifndef BuildHtmlManPages
#ifdef RmanCmd
#define BuildHtmlManPages YES
#else
#define BuildHtmlManPages NO
#endif
#endif
/* Can't do this while bootstrapping imake */
#ifdef BootStrap
#undef BuildHtmlManPages
#define BuildHtmlManPages NO
#endif
#include <Imake.rules>
#ifndef HasSharedLibraries
......@@ -335,6 +380,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasSecureRPC
#define HasSecureRPC NO /* if you have Secure RPC */
#endif
#ifndef HasKrbIV
#define HasKrbIV NO /* if you have Kerberos IV */
#endif
#ifndef HasKrb5
#define HasKrb5 NO /* if you have Kerberos V5 */
#endif
......@@ -363,6 +411,14 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */
#define GzipLibrary -lz
#endif
#if HasKrbIV
#ifndef KrbIVIncludes
#define KrbIVIncludes /**/
#endif
#ifndef KrbIVLibraries
#define KrbIVLibraries -lkafs -lkrb -ldes
#endif
#endif
#if HasKrb5
#ifndef Krb5Includes
#define Krb5Includes -I/krb5/include
......@@ -561,6 +617,18 @@ TCLIBDIR = TclLibDir
#endif
#endif
/*
* SystemUsrLibDir is independent of ProjectRoot. It is used primarily
* to allow links for shared libraries in /usr/lib for compliance to
* various standards (e.g., Linux/OpenGL).
*/
#ifndef SystemUsrLibDir
#define SystemUsrLibDir /usr/lib
#endif
#ifndef SystemUsrIncDir
#define SystemUsrIncDir /usr/include
#endif
#ifndef ShLibDir
#define ShLibDir UsrLibDir
#endif
......@@ -632,6 +700,12 @@ TCLIBDIR = TclLibDir
#define ExtraManDefs -D__projectroot__=$(PROJECTROOT)
#endif
#ifndef HtmlIndexCmd
#if BuildHtmlManPages
#define HtmlIndexCmd $(MKHTMLINDEX)
#endif
#endif
#ifndef LogDirectory
#if HasVarDirectory
#define LogDirectory /var/log
......@@ -873,6 +947,12 @@ TCLIBDIR = TclLibDir
#ifndef LdCmd
#define LdCmd ld
#endif
#ifndef M4Cmd
#define M4Cmd m4
#endif
#ifndef M4Flags
#define M4Flags /**/
#endif
#ifndef LexCmd
#define LexCmd lex
#endif
......@@ -1253,6 +1333,8 @@ TCLIBDIR = TclLibDir
MKDIRHIER = MkdirHierCmd
REVPATH = RevPathCmd
EXPORTLISTGEN = ExportListCmd
RMAN = RmanCmd
RMANOPTIONS = RmanOptions
CONFIGSRC = ConfigSrc
IMAKESRC = $(CONFIGSRC)/imake
DEPENDSRC = DependDir
......@@ -1260,6 +1342,8 @@ TCLIBDIR = TclLibDir
INCROOT = IncRoot /* base of where to put header files */
USRLIBDIR = UsrLibDir /* nonshared libraries */
VARLIBDIR = VarLibDir /* xdm runtime files */
SYSTEMUSRLIBDIR = SystemUsrLibDir /* system's "/usr/lib" */
SYSTEMUSRINCDIR = SystemUsrIncDir /* system's "/usr/include" */
SHLIBDIR = ShLibDir /* shared libraries */
LINTLIBDIR = LintlibDir /* lint libraries */
MANPATH = ManPath /* top of manual page tree */
......@@ -1312,6 +1396,8 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
INSTALLFLAGS = InstallFlags
LD = LdCmd
LEX = LexCmd
M4 = M4Cmd
M4FLAGS = M4Flags
LEXLIB = LexLib
YACC = YaccCmd
CCYACC = CplusplusYaccCmd
......@@ -1619,6 +1705,10 @@ CleanTarget()
MakefileTarget()
#endif
#if BuildHtmlManPages
RmanDependency()
#endif
TagsTarget()
#ifdef MakefileAdditions
MakefileAdditions()
......@@ -1630,6 +1720,8 @@ CenterLoadTarget(debug_obj,$(OBJS),NullParameter,$(ALLDEFINES))
ManKeywordsTarget($(MANPATH))
HtmlManIndex
#ifdef IHaveSubdirs
XCOMM ----------------------------------------------------------------------
XCOMM rules for building in SUBDIRS - do not edit
......@@ -1649,6 +1741,11 @@ IncludesSubdirs($(SUBDIRS))
install.man:: man_keywords
#endif
/* must be after all install.man rules that install anything */
#if MakeHtmlManIndex /* typically only at top level */
install.man:: html_index
#endif
#ifndef IHaveSubdirs
XCOMM ----------------------------------------------------------------------
XCOMM empty rules for directories that do not have SUBDIRS - do not edit
......
......@@ -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.80 2000/02/29 03:08:55 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.83 2000/06/14 00:16:02 dawes Exp $
#ifndef OSName
......@@ -133,14 +133,14 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
*
* Disabled for NetBSD/vax until I figure out the scheme. --CS
*/
#if ((OSMajorVersion > 0) && \
!defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
UseElfFormat
#if !defined(Arm32Architecture) && !defined(VaxArchitecture)
#if (OSMajorVersion > 0) && defined(i386Architecture)
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
#endif
#else
# ifndef DoLoadableServer
# define DoLoadableServer NO
# endif
#endif
#if UseElfFormat
......@@ -190,16 +190,20 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif
# endif
#else
# if defined(AlphaArchitecture)
# define ServerExtraDefines GccGasOption -D_XSERVER64
# if defined(SparcArchitecture)
# define ServerExtraDefines XFree86ServerDefines
# else
# ifdef Arm32Architecture
# define ServerExtraDefines GccGasOption XFree86ServerDefines
# ifndef XFree86ConsoleDefines
# define XFree86ConsoleDefines -DPCCONS_SUPPORT
# endif
# if defined(AlphaArchitecture)
# define ServerExtraDefines GccGasOption -D_XSERVER64
# else
# define ServerExtraDefines GccGasOption
# ifdef Arm32Architecture
# define ServerExtraDefines GccGasOption XFree86ServerDefines
# ifndef XFree86ConsoleDefines
# define XFree86ConsoleDefines -DPCCONS_SUPPORT
# endif
# else
# define ServerExtraDefines GccGasOption
# endif
# endif
#endif
#endif
......@@ -307,7 +311,8 @@ dirs: .EXEC @@\