diff options
Diffstat (limited to 'xc/config/cf')
29 files changed, 1370 insertions, 188 deletions
diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf index 1043ed8bf..3acc3f5a7 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.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 @@ -82,11 +90,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #if defined(UseInstalled) #define DefaultCCOptions /**/ #else -#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions +/*#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions*/ #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 diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf index 00954b912..bb9b64710 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.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. diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules index 642945a57..93718e2ba 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.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) @@ -1138,6 +1139,17 @@ install:: LibraryTargetName(libname) @@\ /* + * 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 */ #ifndef MergeIntoInstalledLibrary @@ -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 diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl index d4bf580c8..cf62c8596 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.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 diff --git a/xc/config/cf/NetBSD.cf b/xc/config/cf/NetBSD.cf index fdbfa4183..b103ca849 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.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 @@\ #define FileManSuffix 5 #define ManSourcePath $(MANPATH)/cat -#define InstallManPageLong(file,destdir,dest) @@\ +#define InstallManPageLongBase(file,destdir,dest) @@\ + @@\ all:: file.0 @@\ @@\ file.0:: file.man @@\ @@ -328,8 +333,15 @@ install.man:: @@\ clean:: @@\ RemoveFile(file.0) +#define InstallManPageLong(file,destdir,dest) @@\ +BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ +InstallManPageLongBase(file,destdir,dest) + #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ - InstallManPageLong(file,destdir,dest) +BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ +InstallManPageLongBase(file,destdir,dest) #define InstallMultipleMan(list,dest) @@\ install.man:: @@\ @@ -358,7 +370,7 @@ install.man:: @@\ $(RM) $$i.0 ); \ @@\ done -#define InstallManPageAliases(file,destdir,aliases) @@\ +#define InstallManPageAliasesBase(file,destdir,aliases) @@\ install.man:: @@\ @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ for i in aliases; do \ @@\ @@ -368,8 +380,15 @@ install.man:: @@\ ); \ @@\ done +#define InstallManPageAliases(file,destdir,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) + #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ - InstallManPageAliases(file,destdir,aliases) +InstallHtmlManPageAliases(file,aliases,suffix) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) /* * Shared libraries supported starting in 1.0 on a.out platforms, @@ -431,6 +450,10 @@ install.man:: @@\ #ifndef UseRgbTxt #define UseRgbTxt YES #endif +#define BuildXF86VidModeExt NO +#define BuildXF86DGA NO +#define BuildXInputExt NO +#include <xfree86.cf> #endif /* @@ -449,6 +472,8 @@ sed 's/\.[0-9]*$$//'` */ #ifdef AlphaArchitecture #define BuildServer NO +/* Build the shared XDM greeter on Alph if it supports shared libs */ +#define SharedLibXdmGreet HasSharedLibraries #endif /* @@ -457,3 +482,7 @@ sed 's/\.[0-9]*$$//'` #ifdef VaxArchitecture #define BuildServer NO #endif + +#ifndef SharedLibXdmGreet +#define SharedLibXdmGreet NO +#endif diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf index 8c00d3ba1..95d6e383e 100644 --- a/xc/config/cf/OpenBSD.cf +++ b/xc/config/cf/OpenBSD.cf @@ -1,6 +1,4 @@ -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 platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.37 2000/06/24 17:43:44 dawes Exp $ XCOMM #ifndef OSName @@ -37,28 +35,46 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasWChar32 YES #define HasMkstemp YES #define HasZlib YES +#ifndef HasKrbIV +#define HasKrbIV YES +#endif #define HasDlopen YES #define DlLibrary /**/ #define HasUsableFileMmap YES #define HasNCurses YES #define NCursesLibName -lcurses +#if defined(TermcapLibrary) +#undef TermcapLibrary +#endif +#define TermcapLibrary -lcurses #define HasVarRun YES #define HasVarDb YES +#ifndef HasLibPthread +#define HasLibPthread NO +#endif + /* * 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 +# define HasPosixThreads YES +# define ThreadedX YES +# define SystemMTDefines -D_REENTRANT +# if HasLibPthread +# define ThreadsLibraries -lpthread +# else +# define BuildThreadStubLibrary YES +# define NeedUIThrStubs YES +# define ThreadsCompileFlags -pthread +# define ThreadsLibraries -lc_r +# endif +#endif + +#if OSMajorVersion == 2 && OSMinorVersion > 6 || OSMajorVersion >= 3 +# define HasThreadSafeAPI YES #endif /* @@ -129,20 +145,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 -# define ServerExtraDefines GccGasOption +# if defined(AlphaArchitecture) +# define ServerExtraDefines GccGasOption -D_XSERVER64 +# else +# define ServerExtraDefines GccGasOption +# endif # endif #endif #define StandardDefines -DCSRG_BASED #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC -#ifndef DoLoadableServer -#define DoLoadableServer YES -#endif - #ifndef ExtraLibraries #define ExtraLibraries /**/ #endif @@ -198,15 +214,14 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define FileManSuffix 5 #define ManSourcePath $(MANPATH)/cat -#define InstallManPageLong(file,destdir,dest) @@\ +#define InstallManPageLongBase(file,destdir,dest) @@\ all:: file.0 @@\ @@\ file.0:: file.man @@\ @if [ -f file.man ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ - cp /tmp/$$$$.man file.0; \ @@\ - $(RM) /tmp/$$$$.man; \ @@\ + cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\ + | $(COL) > file.0; \ @@\ fi @@\ @@\ install.man:: @@\ @@ -219,8 +234,15 @@ install.man:: @@\ clean:: @@\ RemoveFile(file.0) +#define InstallManPageLong(file,destdir,dest) @@\ +BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ +InstallManPageLongBase(file,destdir,dest) + #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ - InstallManPageLong(file,destdir,dest) +BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ +InstallManPageLongBase(file,destdir,dest) #define InstallMultipleMan(list,dest) @@\ install.man:: @@\ @@ -249,7 +271,7 @@ install.man:: @@\ $(RM) $$i.0 ); \ @@\ done -#define InstallManPageAliases(file,destdir,aliases) @@\ +#define InstallManPageAliasesBase(file,destdir,aliases) @@\ install.man:: @@\ @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ for i in aliases; do \ @@\ @@ -259,8 +281,15 @@ install.man:: @@\ ); \ @@\ done +#define InstallManPageAliases(file,destdir,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) + #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ - InstallManPageAliases(file,destdir,aliases) +InstallHtmlManPageAliases(file,aliases,suffix) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) /* @@ -333,27 +362,31 @@ install:: fonts.alias @@\ */ #ifdef i386Architecture +# ifndef DoLoadableServer +# define DoLoadableServer YES +# endif + /* 2.7 and later will have support for setting MTRRs */ -#ifndef HasMTRRSupport -#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6) -#define HasMTRRSupport YES -#else -#define HasMTRRSupport NO -#endif -#endif +# ifndef HasMTRRSupport +# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6) +# define HasMTRRSupport YES +# else +# define HasMTRRSupport NO +# endif +# endif /* Support for USB Mices */ -#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) -#define UsbMouseSupport YES -#endif +# 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 +# if OSMajorVersion == 2 && OSMinorVersion >= 6 +# define FreeBSDGccOptBug +# endif # include <xfree86.cf> @@ -468,11 +501,11 @@ install:: fonts.alias @@\ # ifndef BuildXKBlib # define BuildXKBlib NO # endif +#endif # ifndef BuildPexExt # define BuildPexExt (XsunServer || Xsun24Server) # endif -#endif #endif /* Sun3Architecture */ @@ -519,19 +552,29 @@ install:: fonts.alias @@\ #endif /* PmaxArchitecture */ -#ifdef ppcArchitecture +/* + * Definitions for the PowerPC architecture + */ +#ifdef PpcArchitecture + +/* #define GccWarningOptions -Wall -Wpointer-artith */ + +# include <xf86.rules> +# ifndef BuildServer +# define BuildServer NO +# endif + # define HasSharedLibraries NO # define UseElfFormat YES # define BuildDynamicLoading NO -#endif + +#endif /* PpcArchitecture */ /* * Definitions for the sparc architecture */ #ifdef SparcArchitecture -# include <xf86.rules> - # ifndef Xsun24Server # define Xsun24Server YES # endif @@ -547,6 +590,12 @@ install:: fonts.alias @@\ # ifndef BuildPexExt # define BuildPexExt (XsunServer || Xsun24Server) # endif + +# define BuildXF86VidModeExt NO +# define BuildXF86DGA NO +# define BuildXInputExt NO +# include <xfree86.cf> + #endif /* SparcArchitecture */ @@ -554,8 +603,13 @@ install:: fonts.alias @@\ /* * Generic settings for all architectures + * which can be overridden by architecture specific sections above */ +#ifndef DoLoadableServer +#define DoLoadableServer NO +#endif + #ifndef XVirtualFramebufferServer # undef BuildServer # define BuildServer YES @@ -580,6 +634,10 @@ install:: fonts.alias @@\ # define CompressAllFonts YES #endif +#ifndef SharedLibXdmGreet +# define SharedLibXdmGreet NO +#endif + /* * XFree86 uses its own (more portable) database routines to speed up * the RGB database lookups diff --git a/xc/config/cf/README b/xc/config/cf/README index 494823105..30797bd95 100644 --- a/xc/config/cf/README +++ b/xc/config/cf/README @@ -3,7 +3,7 @@ $TOG: README /main/76 1998/05/11 14:35:10 barstow $ -$XFree86: xc/config/cf/README,v 1.10 1998/10/02 06:15:01 dawes Exp $ +$XFree86: xc/config/cf/README,v 1.11 2000/06/14 00:16:02 dawes Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! @@ -65,6 +65,7 @@ Imake.tmpl provides defaults for the following variables: HasGcc2 boolean for system has GNU gcc 2.x compiler HasGcc2ForCplusplus use gcc 2 for C++ programs? HasGnuMake use the GNU make program? + HasKrbIV system has Kerberos version IV support? HasKrb5 system has Kerberos version 5 support? HasLargeTmp boolean for system has /tmp space HasLatex system has LaTeX document preparation software @@ -97,6 +98,8 @@ Imake.tmpl provides defaults for the following variables: InstPgmFlags install flags for normal programs InstUidFlags install flags for xterm to chown /dev/ptys InstallCmd command to install files + KrbIVIncludes where to include KerberosIV header files from + KrbIVLibraries where to load KerberosIV libraries from Krb5Includes where to include Kerberos header files from Krb5Libraries where to load Kerberos libraries from LdCmd command to run loader @@ -230,6 +233,7 @@ X11.tmpl provides defaults for the following variables: InstallSecurityConfig install server security policy file over old? InstallXdmConfig install xdm config files over old? InstallXinitConfig install xinit config files over old? + KrbIVDefines defines for use with KerberosIV LibDir directory in which to install X11 support files LibManSuffix man suffix for library pages LibmanDir directory in which to install library man pages diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index 2e2fbf4cf..b0522c664 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.62 2000/03/02 17:52:50 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.71 2000/06/25 20:17:28 dawes Exp $ /*************************************************************************** * * @@ -774,6 +774,13 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #ifndef ServerOSDefines #define ServerOSDefines /**/ #endif +#if HasKrbIV +#ifndef KrbIVDefines +#define KrbIVDefines -DKERBEROS +#endif +#else +#define KrbIVDefines /**/ +#endif #if HasKrb5 #ifndef Krb5Defines #define Krb5Defines -DK5AUTH @@ -1068,6 +1075,10 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #define XkbComp xkbcomp #endif +#ifndef PsWrap +#define PsWrap $(PSWRAPSRC)/pswrap +#endif + #ifndef ResourceConfigurationManagement #define ResourceConfigurationManagement YES #endif @@ -1141,12 +1152,16 @@ XCOMM X Window System make variables; these need to be coordinated with rules RGB = $(BINDIR)/rgb FONTC = $(BINDIR)/bdftopcf MKFONTDIR = $(BINDIR)/mkfontdir + MKHTMLINDEX = $(BINDIR)/mkhtmlindex #else RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir + MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh #endif + HTMLINDEXCMD = HtmlIndexCmd + DOCUTILSRC = $(XTOP)/doc/util CLIENTSRC = $(TOP)/clients DEMOSRC = $(TOP)/demos @@ -1170,6 +1185,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules EXTINCSRC = $(XTOP)/include/extensions FTSOURCEDIR = FreeTypeSrcDir XTTSOURCEDIR = XTrueTypeSrcDir + PSWRAPSRC = $(XTOP)/config/pswrap TRANSCOMMSRC = $(LIBSRC)/xtrans TRANS_INCLUDES = -I$(TRANSCOMMSRC) CONNECTION_FLAGS = ConnectionFlags ExtraConnectionDefs @@ -1422,7 +1438,7 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #define SharedLibGlx HasSharedLibraries #endif #ifndef NormalLibGlx -#define NormalLibGlx YES +#define NormalLibGlx (!SharedLibX11 | ForceNormalLib) #endif #ifndef DebugLibGlx #define DebugLibGlx NO @@ -1430,6 +1446,17 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #ifndef ProfileLibGlx #define ProfileLibGlx NO #endif +#if NothingOutsideProjectRoot +#undef LinkGLToUsrLib +#define LinkGLToUsrLib NO +#endif +#ifndef LinkGLToUsrInclude +#define LinkGLToUsrInclude NO +#endif +#if NothingOutsideProjectRoot +#undef LinkGLToUsrInclude +#define LinkGLToUsrInclude NO +#endif #endif #ifndef SharedLibXext @@ -1544,6 +1571,18 @@ ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),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 @@ -2504,6 +2543,6 @@ install:: deps @@\ #endif #ifndef InstallRoffDoc - #define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt) #endif + diff --git a/xc/config/cf/bsdi.cf b/xc/config/cf/bsdi.cf index 9485e9b36..d2acbd862 100644 --- a/xc/config/cf/bsdi.cf +++ b/xc/config/cf/bsdi.cf @@ -1,28 +1,63 @@ XCOMM platform: $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $ -XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.27 1999/04/17 09:08:04 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.30 2000/06/30 17:15:05 dawes Exp $ #ifndef OSName -#define OSName BSD/OS 2.0 +#define OSName DefaultOSName #endif #ifndef OSVendor -#define OSVendor BSDI +#define OSVendor BSDI #endif -XCOMM operating system: OSName #ifndef OSMajorVersion -#define OSMajorVersion 2 +#define OSMajorVersion DefaultOSMajorVersion #endif #ifndef OSMinorVersion -#define OSMinorVersion 0 +#define OSMinorVersion DefaultOSMinorVersion #endif +#ifndef OSTeenyVersion +#define OSTeenyVersion DefaultOSTeenyVersion +#endif +XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + +#define HasBSD44Sockets YES +#define HasBsdMake YES +#define HasDlopen YES +#define HasPutenv YES +#define HasSnprintf YES +#define HasUsableFileMmap YES +#define HasZlib YES + +#if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4) +#define HasNCurses YES +#else +#define HasNCurses NO +#endif + +#define BuildLBX YES +#define GzipFontCompression NO -#define HasPutenv YES -#define HasBSD44Sockets YES +XCOMM BSD/OS 4.1 (intel) comes with gcc 2.91.66 installed as gcc and cc. +XCOMM BSD/OS 4.1 (sparc) comes with gcc 2.95.2 installed as gcc and cc. + +XCOMM BSD/OS 4.0.1 (intel) comes with gcc 2.7.2.1 installed as gcc2, gcc and cc. +XCOMM BSD/OS 4.0.1 (sparc) comes with gcc 2.7.2.1 installed as gcc2, gcc and cc. +XCOMM Punt on OS revs earlier than 4.0.1 + +XCOMM BSDI uses shlicc for compiling C and shlic++ for compiling C++ +XCOMM using static shared libraries. We also build ELF dynamic shared +XCOMM libraries as well as normal archive libraries. + +XCOMM BSD/OS 3.0 comes with gcc 2.7.2 installed as gcc2 and gcc. +XCOMM gcc 1.42 is installed as cc. + +XCOMM BSD/OS 2.1 comes with gcc 2.7.1 installed as gcc2 and gcc. +XCOMM gcc 1.42 is installed as cc. XCOMM BSD/OS 2.0 comes with gcc 2.6.3 installed as gcc2 and gcc. XCOMM gcc 1.42 is installed as cc. + XCOMM BSD/386 1.1 comes with gcc 2.5.8 installed as gcc2. XCOMM BSD/386 1.0 comes with gcc 1.40 as the only compiler. -XCOMM The default is to use gcc2 on release 2.0 and 1.1 and gcc1 on 1.0 +XCOMM The default is to use gcc2 on release 2.1, 2.0 and 1.1 and gcc1 on 1.0 XCOMM The defaults can be altered by defining "HasGcc2" as YES or NO in XCOMM xf86site.def @@ -38,28 +73,38 @@ XCOMM xf86site.def # ifndef HasGcc2ForCplusplus # define HasGcc2ForCplusplus YES # endif -# define CcCmd gcc2 -# define OptimizedCDebugFlags DefaultGcc2i386Opt +# ifdef i386Architecture +# define CcCmd gcc /* shlicc */ +# define CplusplusCmd g++ /* shlicc++ */ +# define OptimizedCDebugFlags -O2 -m486 +# else +# define CcCmd gcc +# define CplusplusCmd g++ +# define OptimizedCDebugFlags -O4 -mv8 +# endif #else # define CcCmd cc # define OptimizedCDebugFlags -O #endif + #define CppCmd /usr/bin/cpp #define TroffCmd groff -Tps #define MkdirHierCmd mkdir -p #define SetTtyGroup YES #define HasNdbm YES +#define DBMLibrary /**/ #define HasWChar32 YES #define DirFailPrefix - #define AvoidNullMakeCommand YES + # ifndef GccUsesGas # define GccUsesGas YES # endif #if HasGcc -#if defined(UseInstalled) +#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) #define DefaultCCOptions /**/ #else -#define DefaultCCOptions -ansi +#define DefaultCCOptions /* -ansi */ #endif #endif @@ -69,17 +114,57 @@ XCOMM xf86site.def # define GccGasOption /**/ #endif -#define HasShm YES -#define ServerExtraDefines GccGasOption XFree86ServerDefines -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -#define XFree86ConsoleDefines /**/ +#ifdef i386Architecture +#ifndef BuildXF86DRI +#define BuildXF86DRI NO +#endif +#endif + +#ifdef i386Architecture +# define HasTk YES +# define TkLibName tk4.2 +# define TkLibDir /usr/contrib/lib +# define TkIncDir /usr/include +# define XF86SetupUsesStaticTk NO +# define HasTcl YES +# define TclLibName tcl7.6 +# define TclLibDir /usr/contrib/lib +# define TclIncDir /usr/include +# define XF86SetupUsesStaticTcl NO +# define ServerExtraDefines GccGasOption XFree86ServerDefines -I/sys +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define XFree86ConsoleDefines /**/ +# define AsmDefines -DUSE_GAS +# if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 1) +# include <bsdiLib.rules> +# define DontUseLibPathVar +# define BuildDynamicLoading YES +# define ServerCcCmd cc +# define ServerExtraSysLibs DlLibrary +# endif +#endif + +#ifdef SparcArchitecture +# define ServerExtraDefines +# define ServerOSDefines -DDDXOSINIT +#endif + +#ifdef PpcArchitecture +# define BuildServer NO +#endif + +#define HasShm YES #define AsmDefines -DUSE_GAS -#define StandardDefines -DCSRG_BASED +#ifndef LdPreLib +#define LdPreLib -L$(BUILDLIBDIR) -L$(USRLIBDIR) +#endif + +#define StandardDefines -D__ELF__ -DCSRG_BASED #define InstallCmd /usr/bin/install -#define EqnCmd eqn -Tps -#define NeqnCmd eqn -Tascii +#define EqnCmd eqn -Tps +#define NeqnCmd eqn -Tascii COL = col NEQN = NeqnCmd NROFF = nroff @@ -87,6 +172,15 @@ XCOMM xf86site.def #define DefaultUserPath :/bin:/usr/bin:/usr/local/bin:$(BINDIR) #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) +#define StripInstalledPrograms YES +#define InstPgmFlags -s -m 0555 -o bin -g bin +#define InstBinFlags -m 0555 -o bin -g bin +#define InstUidFlags -m 4555 -o root -g bin +#define InstLibFlags -m 0444 -o bin -g bin +#define InstIncFlags -m 0444 -o bin -g bin +#define InstManFlags -m 0444 -o bin -g bin +#define InstDatFlags -m 0444 -o bin -g bin + XCOMM Man pages need to be formatted when installed, so override the default XCOMM imake rules. @@ -104,8 +198,6 @@ file.0:: file.man @@\ $(RM) /tmp/$$$$.man; \ @@\ fi @@\ @@\ -file.man:: @@\ - @@\ install.man:: @@\ MakeDir($(DESTDIR)destdir) @@\ -@if [ -f file.0 ]; \ @@\ @@ -146,6 +238,43 @@ install.man:: @@\ /* * These seem redundant, but leave them in for now. */ +#ifdef i386Architecture #define i386Bsd 1 #define i386Bsdi 1 #include <xfree86.cf> +#endif + +#ifdef SparcArchitecture +#ifndef XsunMonoServer +#define XsunMonoServer NO /* monochrome only */ +#endif +#ifndef XsunServer +#define XsunServer YES /* mono + 8 bit color */ +#endif +#ifndef Xsun24Server +#define Xsun24Server NO /* mono + 8 bit color + 24 bit c +olor */ +#endif + +#ifndef BuildPexExt +#define BuildPexExt (XsunServer || Xsun24Server) +#endif + +#ifndef NeedConstPrototypes +#define NeedConstPrototypes YES +#endif +#ifndef NeedNestedPrototypes +#define NeedNestedPrototypes YES +#endif +#ifndef NeedVarargsPrototypes +#define NeedVarargsPrototypes YES +#endif + +#define PexCCOptions DefaultCCOptions + +#ifndef BuildXKB +#define BuildXKB YES +#endif + +#endif /* SparcArchitecture */ + diff --git a/xc/config/cf/bsdiLib.rules b/xc/config/cf/bsdiLib.rules new file mode 100644 index 000000000..fc1dd8dc2 --- /dev/null +++ b/xc/config/cf/bsdiLib.rules @@ -0,0 +1,246 @@ +XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.1 2000/05/18 00:33:16 dawes Exp $ + +/* + * BSDI shared library rules (converted from SVr4/Linux rules) + */ + +#ifndef HasSharedLibraries +#define HasSharedLibraries YES +#endif +#ifndef ForceNormalLib +#define ForceNormalLib YES +#endif +#ifndef SharedDataSeparation +#define SharedDataSeparation NO +#endif +#ifndef SharedCodeDef +#define SharedCodeDef /**/ +#endif +#ifndef SharedLibraryDef +#define SharedLibraryDef /**/ +#endif +#ifndef ShLibIncludeFile +#define ShLibIncludeFile <bsdiLib.tmpl> +#endif +#ifndef SharedLibraryLoadFlags +#define SharedLibraryLoadFlags -shared +#endif +#ifndef PositionIndependentCFlags +#define PositionIndependentCFlags -fPIC +#endif +#ifndef PositionIndependentCplusplusFlags +#define PositionIndependentCplusplusFlags -fPIC +#endif +#ifndef BaseShLibReqs +#define BaseShLibReqs -lc +#endif +#ifndef RanlibInstFlags +#define RanlibInstFlags -t +#endif +#ifndef SharedCCLdCmd +/* NOT $(CC), which is probably 'shlicc'. */ +#define SharedCCLdCmd cc +#endif + +/* + * InstallSharedLibrary - generate rules to install the shared library. + */ +#ifndef InstallSharedLibrary +#define InstallSharedLibrary(libname,rev,dest) @@\ +install:: Concat(lib,libname.so.rev) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\ + $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\ + $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) +#endif /* InstallSharedLibrary */ + +/* + * InstallSharedLibraryData - generate rules to install the shared library data + */ +#ifndef InstallSharedLibraryData +#define InstallSharedLibraryData(libname,rev,dest) +#endif /* InstallSharedLibraryData */ + + +/* + * SharedLibraryTarget - generate rules to create a shared library; + * build it into a different name so that we do not hose people by having + * the library gone for long periods. + */ +#ifndef SharedLibraryTarget +#ifdef UseInstalled +#define LinkBuildSonameLibrary(lib) true +#else +#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ + cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) +#endif + +#define SharedLibraryTarget(libname,rev,solist,down,up) @@\ +AllTarget(Concat(lib,libname.so.rev)) @@\ + @@\ +Concat(lib,libname.so.rev): solist @@\ + $(RM) $@~ @@\ + @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\ + (cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS) \ + -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ + $(RM) $$SONAME; $(LN) $@ $$SONAME; \ + LinkBuildSonameLibrary($$SONAME) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + $(RM) Concat(lib,libname.so) @@\ + $(LN) $@ Concat(lib,libname.so) @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibrary(Concat(lib,libname.so)) @@\ + @@\ +clean:: @@\ + @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\ + set -x; $(RM) $$SONAME @@\ + $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) + +#endif /* SharedLibraryTarget */ + +/* + * SharedDepLibraryTarget - generate rules to create a shared library; + * build it into a different name so that we do not hose people by having + * the library gone for long periods. + */ +#ifndef SharedDepLibraryTarget +#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ +AllTarget(Concat(lib,libname.so.rev)) @@\ + @@\ +Concat(lib,libname.so.rev): deplist @@\ + $(RM) $@~ @@\ + @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\ + (cd down; $(CCENVSETUP) SharedCCLdCmd -o up/$@~ $(SHLIBLDFLAGS) \ + -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ + $(RM) $$SONAME; $(LN) $@ $$SONAME; \ + LinkBuildSonameLibrary($$SONAME) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + $(RM) Concat(lib,libname.so) @@\ + $(LN) $@ Concat(lib,libname.so) @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibrary(Concat(lib,libname.so)) @@\ + @@\ +clean:: @@\ + @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\ + set -x; $(RM) $$SONAME @@\ + $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) + +#endif /* SharedDepLibraryTarget */ + +#ifndef SharedDepModuleTarget +#define SharedDepModuleTarget(name,deps,solist) @@\ +AllTarget(name) @@\ + @@\ +name: deps @@\ + $(RM) $@~ @@\ + $(CCENVSETUP) SharedCCLdCmd -o $@~ $(SHLIBLDFLAGS) \ + solist $(REQUIREDLIBS) BaseShLibReqs @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + @@\ +clean:: @@\ + $(RM) name + +#endif /* SharedDepModuleTarget */ + + +/* + * SharedLibraryDataTarget - generate rules to create shlib data file; + */ +#ifndef SharedLibraryDataTarget +#define SharedLibraryDataTarget(libname,rev,salist) +#endif /* SharedLibraryTarget */ + +/* + * Hacks for BSD/OS static shared libraries. + * We replace the normal library build and install rules. + */ + +SHLIB_MAP=$${SHLIB_MAP-/etc/shlib.map} + +#define BsdiStaticLibraryName(libname)Concat(Concat(lib,libname),_s) +#define BsdiStaticStubLibraryName(libname)BsdiStaticLibraryName(libname).a + +#define MakeBsdiStaticSharedLibrary(libname) \ + @SHARED=; \ + eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \ + 'echo "TADDR=$$2;";' \ + 'echo "DADDR=$$3;";' \ + 'echo "SHARED=$$5;";' \ + 'shift 5; echo "ARGS='"'"'"$$@"'"'"';";' \ + 'exit 0; }'; cat $(SHLIB_MAP)) | sh); \ + [ -n "$$SHARED" ] || exit 0; \ + echo building static shared libname library; \ + shlib -m $(SHLIB_MAP) -t $$TADDR -d $$DADDR \ + -n BsdiStaticLibraryName(libname) \ + -s BsdiStaticStubLibraryName(libname) \ + $$( [ -f 'loader.lib'libname'.c' ] && \ + echo -b 'loader.lib'libname'.c') \ + $$( [ -f 'lib'libname'.const' ] && \ + echo -c 'lib'libname'.const') \ + $$( [ -f 'lib'libname'.except' ] && \ + echo -e 'lib'libname'.except') \ + $$( [ -f $$SHARED ] && echo -i $$SHARED) \ + $$ARGS LibraryTargetName(libname) + +#define InstallBsdiStaticSharedLibrary(libname) \ + @SHARED=; \ + eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \ + 'echo "SHARED=$$5;";' \ + 'echo "STUB=$$(dirname $$4)/$$(basename $$5).a;";' \ + 'exit 0; }'; cat $(SHLIB_MAP)) | sh); \ + [ -n "$$SHARED" ] || exit 0; \ + echo installing static shared libname library; \ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \ + BsdiStaticLibraryName(libname) $(DESTDIR)$$SHARED; \ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \ + BsdiStaticStubLibraryName(libname) $(DESTDIR)$$STUB; \ + RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)$$STUB) @@\ + -@eval $$( (echo 'MAP() { [ "X$$1" = "X-l'libname'" ] || return 0;' \ + 'echo "LDIR=$$(dirname $$4)"; exit 0; }'; \ + cat $(SHLIB_MAP)) | sh); \ + [ -f Concat(loader.lib,libname.c) ] && \ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \ + Concat(loader.lib,libname.c) \ + $(DESTDIR)$$LDIR/Concat(loader.lib,libname.c); \ + [ -f Concat(lib,libname.const) ] && \ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \ + Concat(lib,libname.const) \ + $(DESTDIR)$$LDIR/Concat(lib,libname.const); \ + [ -f Concat(lib,libname.except) ] && \ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \ + Concat(lib,libname.except) \ + $(DESTDIR)$$LDIR/Concat(lib,libname.except); exit 0 + +#ifndef UnsharedLibraryTarget +#define UnsharedLibraryTarget(libname,objlist,down,up) @@\ +AllTarget(LibraryTargetName(libname)) @@\ + @@\ +LibraryTargetName(libname): objlist @@\ + RemoveFile($@) @@\ + (cd down; MakeLibrary(up/$@,objlist)) @@\ + RanLibrary($@) @@\ + _LinkBuildLibrary($@) @@\ + MakeBsdiStaticSharedLibrary(libname) @@\ + @@\ +clean:: @@\ + $(RM) BsdiStaticLibraryName(libname) BsdiStaticStubLibraryName(libname) +#endif /* UnsharedLibraryTarget */ + +#ifndef UnsharedLibraryTarget3 +#define UnsharedLibraryTarget3(libname,objlist1,objlist2,objlist3,down,up) @@\ + UnsharedLibraryTarget(libname,objlist1 objlist2 objlist3,down,up) +#endif /* UnsharedLibraryTarget3 */ + +#ifndef InstallLibrary +#define InstallLibrary(libname,dest) @@\ +install:: LibraryTargetName(libname) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) \ + LibraryTargetName(libname) $(DESTDIR)dest @@\ + RanLibrary($(RANLIBINSTFLAGS) \ + $(DESTDIR)dest/LibraryTargetName(libname)) @@\ + InstallBsdiStaticSharedLibrary(libname) +#endif /* InstallLibrary */ diff --git a/xc/config/cf/bsdiLib.tmpl b/xc/config/cf/bsdiLib.tmpl new file mode 100644 index 000000000..82873b181 --- /dev/null +++ b/xc/config/cf/bsdiLib.tmpl @@ -0,0 +1,44 @@ +XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.1 2000/05/18 00:33:16 dawes Exp $ + +/* + * BSDI shared library template (converted from Linux template) + */ + +/* + * Linux ELF shared libraries (which BSDI uses) + * are deficient in link semantics... + */ + +#ifndef FixupLibReferences +#define FixupLibReferences() @@\ +XMULIBONLY = -lXmu @@\ +XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) +#endif + +#ifndef XawClientLibs +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#endif + +#define CplusplusLibC +#define FrescoSysLibs CplusplusLibC MathLibrary + +#define SharedX11Reqs +#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) +#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXiReqs $(LDPRELIB) $(XLIB) +#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary +#define SharedXtstReqs $(LDPRELIB) $(XLIB) +#define SharedXieReqs $(LDPRELIB) $(XLIBONLY) +#define SharedSMReqs $(LDPRELIB) $(ICELIB) +#define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs +#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs + +/* Motif lib requirements */ +#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) +#define SharedXmReqs $(LDPRELIB) SharedXReqs +#define SharedMrmReqs $(LDPRELIB) $(XMLIB) SharedXReqs +#define SharedUilReqs $(LDPRELIB) $(XMLIB) SharedXReqs diff --git a/xc/config/cf/host.def b/xc/config/cf/host.def index 0cd688c3b..8f098ec2a 100644 --- a/xc/config/cf/host.def +++ b/xc/config/cf/host.def @@ -2,7 +2,7 @@ #define DefaultGcc2i386Opt -g -O2 #define LibraryCDebugFlags -g -O2 #define BuildServersOnly YES -#define XF86CardDrivers vga tdfx i810 mga r128 glint +#define XF86CardDrivers tdfx #define LinuxDistribution LinuxRedHat #define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ diff --git a/xc/config/cf/itsy.cf b/xc/config/cf/itsy.cf index 282421b77..7d932fd2e 100644 --- a/xc/config/cf/itsy.cf +++ b/xc/config/cf/itsy.cf @@ -2,8 +2,8 @@ * This configuration file contains additional configuration needed * to cross compile X for the Compaq Itsy handheld computer. * To use this, add the following to host.def: + #define KDriveXServer YES #define XItsyServer YES - #define KDriveServer YES */ #define CrossCompiling YES diff --git a/xc/config/cf/kdrive.cf b/xc/config/cf/kdrive.cf index 10c9d475e..035122ca7 100644 --- a/xc/config/cf/kdrive.cf +++ b/xc/config/cf/kdrive.cf @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.2 1999/12/30 03:56:16 robin Exp $ +XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.3 2000/03/31 22:55:14 dawes Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -198,6 +198,7 @@ XF86COMSRC=. #define InstallDriverSDKMultipleDestFlags(list,dest,flags) /**/ #define InstallDriverSDKDynamicModule(module,dest,subdir) /**/ #define InstallDriverSDKObjectModule(module,dest,subdir) /**/ +#define InstallDriverSDKObjectSubModule(module,dest,subdir) /**/ #define InstallDriverSDKLibraryModule(module,dest,subdir) /**/ #define ServerDriverSDKTarget(program) /**/ #define InstallDriverSDKProgramWithFlags(program,dest,flags) /**/ diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf index d51ba9785..1882ef75e 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.119 2000/03/03 01:11:05 mvojkovi Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.129 2000/06/24 17:43:44 dawes Exp $ #ifndef LinuxElfDefault #define LinuxElfDefault YES @@ -172,12 +172,14 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) /* The DRM module requires kernel services that appeared in late 2.1.x kernels and are known to be present in 2.2.x kernels. */ #ifndef BuildXF86DRI -# ifdef i386Architecture +# if defined(i386Architecture) # if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) # define BuildXF86DRI YES # else # define BuildXF86DRI NO # endif +# elif defined(SparcArchitecture) +# define BuildXF86DRI YES # else # define BuildXF86DRI NO # endif @@ -270,7 +272,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #endif #define AvoidNullMakeCommand YES -#define DebuggableLibraries YES +#ifndef DebuggableLibraries +#define DebuggableLibraries NO +#endif #define CompressAllFonts YES #define Malloc0ReturnsNull YES #define NeedConstPrototypes YES @@ -289,6 +293,14 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define MkdirHierCmd mkdir -p #if LinuxElfDefault #if UseElfFormat +# ifdef MipsArchitecture +# ifndef AsCmd +# define AsCmd gcc -c -x assembler-with-cpp +# endif +# ifndef DoLoadableServer +# define DoLoadableServer NO +# endif +# endif /* MipsArchitecure */ #ifndef CcCmd #define CcCmd gcc #endif @@ -336,7 +348,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #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 @@ -368,7 +379,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define AsCmd as #define LdCmd ld #define AsmDefines -D__ELF__ -#define HasSharedLibraries NO #endif /* ia64Architecture */ #ifdef i386Architecture #define CcCmd gcc -b i486-linux @@ -396,7 +406,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define DoLoadableServer YES #endif #endif +#ifndef CppCmd #define CppCmd /lib/cpp +#endif /* Some Linux distributions have yacc, some don't. All have bison. */ #define YaccCmd bison -y #define LexCmd flex -l @@ -414,8 +426,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define HasVarRun YES #define VarDbDirectory /var/state -#ifndef XF86ExtraCardDrivers -#define XF86ExtraCardDrivers v4l +#ifndef XF86OSCardDrivers +#define XF86OSCardDrivers v4l #endif #ifdef i386Architecture @@ -441,6 +453,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define LinuxMachineDefines -D__ia64__ #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#define DoLoadableServer NO #endif /* ia64Architecture */ #ifdef Mc68020Architecture @@ -465,10 +478,21 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define LinuxMachineDefines -D__sparc__ #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#define PositionIndependentCFlags -fpic -#define PositionIndependentCplusplusFlags -fpic +#define AsVISOption -Av9a +#ifdef Sparc64Architecture +#define AsOutputArchSize 64 +#else +#define AsOutputArchSize 32 +#endif #endif +#ifdef MipsArchitecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__mips__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif + #ifndef StandardDefines #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines #endif @@ -512,6 +536,14 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic #endif +#ifndef LinkGLToUsrLib +#define LinkGLToUsrLib YES +#endif +#ifndef LinkGLToUsrInclude +#define LinkGLToUsrInclude YES +#endif + + #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ diff --git a/xc/config/cf/lnxLib.rules b/xc/config/cf/lnxLib.rules index d583ce09d..a82239d84 100644 --- a/xc/config/cf/lnxLib.rules +++ b/xc/config/cf/lnxLib.rules @@ -1,5 +1,5 @@ XCOMM $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $ -XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.37 1999/06/06 08:47:44 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.38 2000/06/15 20:49:56 dawes Exp $ /* * Linux shared library rules (DLL & ELF versions) @@ -11,7 +11,9 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.37 1999/06/06 08:47:44 dawes Exp $ #define ForceNormalLib NO #endif +#ifndef SharedOldX #define SharedOldX NO +#endif #if UseElfFormat diff --git a/xc/config/cf/lynx.cf b/xc/config/cf/lynx.cf index a1fb27147..3d4469df2 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.33 2000/02/14 19:20:18 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.37 2000/06/20 20:07:56 dawes Exp $ #ifndef OSName @@ -50,10 +50,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #ifndef HasPosixRegex #define HasPosixRegex NO #endif +#if OSMajorVersion == 3 && OSMinorVersion == 1 +# ifndef UseSmartScheduler +# define UseSmartScheduler NO +# endif +#endif #define HasPosixThreads YES #define ThreadedX YES -#define HasThreadSafeAPI YES /* only 2.[345].0 ?? */ +#define HasThreadSafeAPI YES #if HasGcc2 # if OSMajorVersion == 2 && OSMinorVersion == 3 # define ThreadsCompileFlags -mposix -mthreads @@ -69,7 +74,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #if OSMajorVersion == 2 && OSMinorVersion < 3 # define ThreadsLibraries /lib/thread/libc.a /lib/thread/libc_p.a #endif -#if OSMajorVersion == 3 || (OSMajorVersion == 2 && OSMinorVersion <= 5) +#if (OSMajorVersion == 3 && OSMinorVersion == 0) || (OSMajorVersion == 2 && OSMinorVersion <= 5) # define ThreadPreStdAPIDefines -DXPRE_STANDARD_API #endif #define AvoidNullMakeCommand YES @@ -206,13 +211,21 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe /* 3.0 ships with a useable Tcl/Tk for XF86Setup */ #if OSMajorVersion == 3 # ifndef TkLibName -# define TkLibName tk4.2 +# if OSMinorVersion == 0 +# define TkLibName tk4.2 +# else +# define TkLibName tk8.0 +# endif # endif # ifndef TkLibDir # define TkLibDir /usr/lib # endif # ifndef TclLibName -# define TclLibName tcl7.6 +# if OSMinorVersion == 0 +# define TclLibName tcl7.6 +# else +# define TclLibName tcl8.0 +# endif # endif # ifndef TclLibDir # define TclLibDir /usr/lib @@ -267,6 +280,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)* @@\ @@ -282,6 +297,8 @@ install.man:: file.man @@\ #ifndef InstallManPageAliases #define InstallManPageAliases(file,destdir,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ + @@\ install.man:: @@\ @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -294,6 +311,8 @@ install.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* @@\ diff --git a/xc/config/cf/os2.cf b/xc/config/cf/os2.cf index 87b99ed04..186fb0d1d 100644 --- a/xc/config/cf/os2.cf +++ b/xc/config/cf/os2.cf @@ -2,7 +2,7 @@ XCOMM $TOG: os2.cf /main/2 1997/08/05 08:51:25 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.29 2000/04/05 18:13:08 dawes Exp $ #define OSName OS/2 #define OSVendor IBM @@ -37,7 +37,8 @@ XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes * Please report any directories missed to Holger.Veit@gmd.de */ #ifdef UseInstalled -#define IncRoot $(X11ROOT)/XFree86/include +/*#define IncRoot $(X11ROOT)/XFree86/include*/ +#define ConfigDir $(X11ROOT)$(LIBDIR)/config #define LdPreLib -L$(X11ROOT)/XFree86/lib #endif @@ -53,6 +54,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes #define FileManSuffix 4 #define XmanSearchPath /XFree86/man/man #define ManSourcePath $(MANPATH) +#define DontUseLibPAthVar YES /* you must have installed groff! */ #define TblCmd tbl @@ -75,6 +77,12 @@ XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes #ifndef BuildLBX #define BuildLBX YES #endif +#ifndef DoLoadableServer +#define DoLoadableServer YES +#endif +#undef MakeDLLModules +#define MakeDLLModules NO + /* some more properties of the OS/2 implementation */ #define HasNdbm YES @@ -82,6 +90,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes #define HasSockets YES #define HasSnprintf YES #define HasBsearch NO +#define HasFchown NO #define HasLargeTmp NO #define HasPoll NO #define HasBSD44Sockets NO @@ -90,6 +99,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes #define HasVFork NO #define HasVarDirectory NO #define HasStrcasecmp NO +#define StrcasecmpDefines -DNEED_STRCASECMP -Dstrcasecmp=stricmp -Dstrncasecmp=strnicmp #define Malloc0ReturnsNull YES #define SetTtyGroup NO #ifndef HasLibCrypt @@ -101,6 +111,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes #define ConnectionFlags -DTCPCONN -DOS2PIPECONN #define StdIncDir $(C_INCLUDE_PATH) #define HasStickyDirBit NO +#define HasMkstemp NO /* XF86Setup stuff - does not work yet! */ #define HasTcl NO @@ -205,18 +216,9 @@ XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.28 1999/04/29 09:13:20 dawes #define InstDatFlags /**/ #define InstallFlags /**/ -#ifdef i386Architecture -# define OptimizedCDebugFlags DefaultGcc2i386Opt -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -#else -# define OptimizedCDebugFlags -O -# define ServerOSDefines /**/ -#endif -#ifdef i386Architecture -#define ServerExtraDefines GccGasOption XFree86ServerDefines -#else -#define ServerExtraDefines GccGasOption -#endif +#define OptimizedCDebugFlags DefaultGcc2i386Opt +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF +#define ServerExtraDefines GccGasOption XFree86ServerDefines /* * Make & install Features @@ -264,6 +266,9 @@ Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ LintLibReferences(varname,libname,libsource) #endif +#define XFileSearchPathBase 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) + + #include <os2.rules> #include <os2Lib.rules> diff --git a/xc/config/cf/os2.rules b/xc/config/cf/os2.rules index 154e850ef..8d28329bd 100644 --- a/xc/config/cf/os2.rules +++ b/xc/config/cf/os2.rules @@ -2,7 +2,7 @@ XCOMM $XConsortium: os2.rules /main/1 1996/10/31 14:47:27 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.21 2000/04/05 18:13:09 dawes Exp $ .SUFFIXES: .Osuf .c .CCsuf @@ -22,6 +22,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 daw #define Fontc \bdftopcf #define MkFontDir \mkfontdir #define XkbComp \xkbcomp +#define PsWrap \pswrap #else #define ImakeHelper imakesvc #define IMmode u @@ -30,6 +31,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 daw #define Fontc bdftopcf #define MkFontDir mkfontdir #define XkbComp xkbcomp +#define PsWrap pswrap #endif #define echo ImakeHelper 8 @@ -248,10 +250,10 @@ Makefile:: @@\ RMoveToBakFile(Makefile) @@\ ImakeSubCmdHelper -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags -#define AssembleObject(flags) $(RM) $@ @@\ +#define AssembleObject(flags) RemoveFile($@) @@\ $(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.S | grep -v '^\#' > _tmp_.s @@\ $(CC) $(CFLAGS) -o $*.Osuf -c _tmp_.s @@\ - $(RM) _tmp_.s + RemoveFile(_tmp_.s) #define NormalAsmObjectRule() @@\ .S.Osuf: @@\ @@ -316,11 +318,11 @@ target.c: script dep @@\ $(MAKE) SHELL= MAKE=x11make $(MFLAGS) extra Concat(Build,target) @@\ @@\ Concat(Build,target): @@\ - $(RM) target.c @@\ + RemoveFile(target.c) @@\ script args @@\ @@\ clean:: @@\ - $(RM) target.c + RemoveFile(target.c) #ifndef ServerTargetWithFlags #define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\ @@ -562,3 +564,14 @@ $(BUILDBINDIR)/binary: binary @@\ ImakeHelper 13 $(BUILDMODULEDIR) $(BUILDMODULETOP)/$(CURRENT_DIR)/module name #endif /* LinkBuildNamedModule */ +#ifndef MakeEncDir +#define MakeEncDir(deplist,inst,dirlist ) @@\ +AllTarget(encodings.dir) @@\ + @@\ +encodings.dir: deplist @@\ + RemoveFiles(encodings.dir fonts.dir) @@\ + ImakeHelper 16 MkFontDir dirlist @@\ + @@\ +clean:: @@\ + RemoveFiles(fonts.dir encodings.dir) +#endif diff --git a/xc/config/cf/os2Lib.rules b/xc/config/cf/os2Lib.rules index a4c1949f8..00c517893 100644 --- a/xc/config/cf/os2Lib.rules +++ b/xc/config/cf/os2Lib.rules @@ -2,7 +2,7 @@ XCOMM $XConsortium: os2Lib.rules /main/1 1996/10/31 14:47:29 kaleb $ -XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.10 1999/04/29 09:13:20 dawes Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.11 2000/04/05 18:13:09 dawes Exp $ /* * OS2/EMX shared library rules (DLL version) @@ -40,7 +40,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.10 1999/04/29 09:13:20 dawes Exp $ #endif #ifndef NormalSharedLibObjCompile -#define NormalSharedLibObjCompile(options) $(RM) $@ @@\ +#define NormalSharedLibObjCompile(options) RemoveFile($@) @@\ $(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $*.c @@\ touch $*.o #endif @@ -113,12 +113,12 @@ install:: libname.dll libname.a @@\ #ifndef SharedLibraryTarget #define SharedLibraryTarget(libname,rev,solist,down,up) @@\ -AllTarget(libname.dll) @@\ +AllTarget(Concat3(libname,rev,.dll)) @@\ .SUFFIXES: .obj .rsp .def @@\ LBRPATH = $(subst /,\,$(LIBRARY_PATH)) @@\ - LBRDEF = Concat3(libname,os2,.def) @@\ - LBRCPPDEF = Concat3(libname,os2,-def.cpp) @@\ - LBRRSP = Concat3(libname,os2,.rsp) @@\ + LBRDEF = Concat4(libname,rev,os2,.def) @@\ + LBRCPPDEF = Concat4(libname,rev,os2,-def.cpp) @@\ + LBRRSP = Concat4(libname,rev,os2,.rsp) @@\ @@\ link.rsp: $(LBRRSP) $(LBRDEF) @@\ @echo $(LBRPATH)\\dll0.obj+ >link.rsp @@\ @@ -126,13 +126,13 @@ link.rsp: $(LBRRSP) $(LBRDEF) @@\ @echo $(LBRPATH)\\mt\\ $(LBRPATH)\\ $(REQUIREDLIBS) bsd socket c_alias c_static c_import os2 emx2 end >>link.rsp @@\ @echo $(LBRDEF) >>link.rsp @@\ @@\ -libname.dll: $(OBJS) link.rsp @@\ +Concat3(libname,rev,.dll): $(OBJS) link.rsp @@\ link386 @link.rsp >nul @@\ - BuildDllSupportLibs2(libname) @@\ - LinkBuildLibrary(libname.dll) @@\ + BuildDllSupportLibs2(Concat(libname,rev)) @@\ + LinkBuildLibrary(Concat3(libname,rev,.dll)) @@\ @@\ clean:: @@\ - $(RM) libname.lib libname.imp *.obj link.rsp + RemoveFiles(Concat3(libname,rev,.lib) Concat3(libname,rev,.imp) *.obj link.rsp) #endif /* SharedLibraryTarget */ #ifndef NormalLibraryTarget diff --git a/xc/config/cf/os2Lib.tmpl b/xc/config/cf/os2Lib.tmpl index 1efe56c2b..0153124c9 100644 --- a/xc/config/cf/os2Lib.tmpl +++ b/xc/config/cf/os2Lib.tmpl @@ -2,7 +2,7 @@ XCOMM $XConsortium: os2Lib.tmpl /main/1 1996/10/31 14:47:31 kaleb $ -XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.9 2000/04/05 18:13:10 dawes Exp $ /* * OS2/EMX shared library template @@ -13,6 +13,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ /* note these are special because of linking with link386 */ #ifdef NOT_EMX +#define SharedX11Libs $(LDPRELIB) $(SHM) #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) @@ -29,9 +30,13 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ #define SharedGLReqs $(LDPRELIBS) $(XLIB) #define SharedXfontReqs $(LDPRELIBS) $(XLIB) #define SharedXpmReqs $(LDPRELIBS) $(XLIB) +#define SharedDPSReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedDPSTKReqs $(LDPRELIBS) $(DPSLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) #else +#define SharedX11Reqs shm #define SharedXtReqs ..\\..\\exports\\lib\\ ICE SM X11 #define SharedXawReqs ..\\..\\exports\\lib\\ Xmu Xt Xpm X11 Xext +#define SharedXaw6Reqs ..\\..\\exports\\lib\\ Xmu Xt Xpm X11 Xext #define SharedXmuReqs ..\\..\\exports\\lib\\ Xt X11 Xext #define SharedSMReqs ..\\..\\exports\\lib\\ ICE #define SharedXextReqs ..\\..\\exports\\lib\\ X11 @@ -45,8 +50,48 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ #define SharedGLReqs ..\\..\\exports\\lib\\ X11 Xext #define SharedXfontReqs ..\\..\\exports\\lib\\ X11 #define SharedXpmReqs ..\\..\\exports\\lib\\ X11 +#define SharedDPSReqs ..\\..\\exports\\lib\\ Xmu Xt X11 +#define SharedDPSTKReqs ..\\..\\exports\\lib\\ DPS Xmu Xt X11 #endif +/* library revisions, these are typically empty! */ +#define SharedX11Rev /**/ +#define SharedXThrStubRev /**/ +#define SharedXextRev /**/ +#define SharedXssRev /**/ +#define SharedXxf86miscRev /**/ +#define SharedXxf86vmRev /**/ +#define SharedXxf86dgaRev /**/ +#define SharedXxf86rushRev /**/ +#define SharedXvRev /**/ +#define SharedXineramaRev /**/ +#define SharedDpsRev /**/ +#define SharedDpsTkRev /**/ +#define SharedPSResRev /**/ +#define SharedXantiRev /**/ +#define SharedGlxRev /**/ +#define SharedXfontcacheRev /**/ +#define SharedXauRev /**/ +#define SharedXdmcpRev /**/ +#define SharedXmuRev /**/ +#define SharedOldXRev /**/ +#define SharedXpRev /**/ +#define SharedXtRev /**/ +#define SharedXaRev /**/ +#define SharedXawRev /**/ +#define SharedXaw6Rev 6 +#define SharedXiRev /**/ +#define SharedXtstRev /**/ +#define SharedPexRev /**/ +#define SharedXieRev /**/ +#define SharedPhigsRev /**/ +#define SharedICERev /**/ +#define SharedSMRev /**/ +#define SharedXkeyRev /**/ +#define SharedFSRev /**/ +#define SharedFontRev /**/ +#define SharedXpmRev /**/ + /* * By setting this in your Imakefile, you can force using static libraries * to be linked with you app, rather than DLLs @@ -61,6 +106,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ #define SDlibXmu -lXmu_s #define SDlibXt -lXt_s #define SDlibXaw -lXaw_s +#define SDlibXaw6 -lXaw_s #define SDlibXi -lXi_s #define SDlibXIE -lXIE_s #define SDlibXtst -lXtst_s @@ -68,12 +114,15 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ #define SDlibXp -lXp_s #define SDlibXv -lXv_s #define SDlibGL -lGL_s +#define SDlibDPS -lDPS_s +#define SDlibDPSTK -lDPSTK_s #else #define SDlibX11 -lX11 #define SDlibXExt -lXExt #define SDlibXmu -lXmu #define SDlibXt -lXt #define SDlibXaw -lXaw +#define SDlibXaw6 -lXaw #define SDlibXi -lXi #define SDlibXIE -lXIE #define SDlibXtst -lXtst @@ -81,6 +130,8 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ #define SDlibXp -lXp #define SDlibXv -lXv #define SDlibGL -lGL +#define SDlibDPS -lDPS +#define SDlibDPSTK -lDPSTK #endif /* @@ -114,6 +165,10 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ DEPXAWLIB = XAWLIB = _Use(SDlibXaw,-L$(AWIDGETSRC) SDlibXaw) #endif +#if SharedLibXaw6 + DEPXAW6LIB = + XAW6LIB = _Use(SDlibXaw6,-L$(AWIDGETSRC) SDlibXaw6) +#endif #if SharedLibXi DEPXILIB = XILIB = _Use(SDlibXi,-L$(XILIBSRC) SDlibXi) @@ -127,14 +182,22 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.8 1999/06/06 12:13:23 dawes Exp $ PEXLIB = _Use(SDlibPEX5,-L$(PEXLIBSRC) SDlibPEX5) #endif #if SharedLibXp - DEPEXTENSIONLIB = - EXTENSIONLIB = _Use(SDlibXp,-L$(EXTENSIONSRC)/lib SDlibXp) + DEPXPLIB = + XPLIB = _Use(SDlibXp,-L$(EXTENSIONSRC)/lib SDlibXp) #endif #if SharedLibXv - DEPEXTENSIONLIB = - EXTENSIONLIB = _Use(SDlibXv,-L$(EXTENSIONSRC)/lib SDlibXv) + DEPXVLIB = + XVLIB = _Use(SDlibXv,-L$(EXTENSIONSRC)/lib SDlibXv) #endif #if SharedLibGL - DEPEXTENSIONLIB = - EXTENSIONLIB = _Use(SDlibGL,-L$(EXTENSIONSRC)/lib SDlibGL) + DEPGLLIB = + GLLIB = _Use(SDlibGL,-L$(EXTENSIONSRC)/lib SDlibGL) +#endif +#if SharedLibDPS + DEPDPSLIB = + DPSLIB = _Use(SDlibDPS,-L$(EXTENSIONSRC)/lib SDlibDPS) +#endif +#if SharedLibDPSTK + DEPDPSTKLIB = + DPSTKLIB = _Use(SDlibDPSTK,-L$(EXTENSIONSRC)/lib SDlibDPSTK) #endif diff --git a/xc/config/cf/sgiLib.rules b/xc/config/cf/sgiLib.rules index 7a9107ffc..27cdfcd6d 100644 --- a/xc/config/cf/sgiLib.rules +++ b/xc/config/cf/sgiLib.rules @@ -1,5 +1,5 @@ XCOMM $XConsortium: sgiLib.rules /main/16 1996/09/28 18:11:04 rws $ -XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.3 2000/06/15 20:49:56 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES @@ -181,4 +181,24 @@ clean:: @@\ #define SharedLibraryDataTarget(libname,rev,salist) #endif /* SharedLibraryTarget */ +#ifndef SharedDepLibraryTarget +#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ +AllTarget(Concat(lib,libname.so.rev)) @@\ + @@\ +Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $@ solist $(REQUIREDLIBS)) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + $(RM) Concat(lib,libname.so) @@\ + $(LN) $@ Concat(lib,libname.so) @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibrary(Concat(lib,libname.so)) @@\ + sgiX11soHack(libname) @@\ + @@\ +clean:: @@\ + $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) so_locations + +#endif /* SharedDepLibraryTarget */ + #endif /* OsMajorVersion < 5 else */ diff --git a/xc/config/cf/site.def b/xc/config/cf/site.def index 65b093582..4e84dae6f 100644 --- a/xc/config/cf/site.def +++ b/xc/config/cf/site.def @@ -21,7 +21,7 @@ XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ * .cf file, not overridden in site.def. * * * ***************************************************************************/ -XCOMM site: $XFree86: xc/config/cf/site.def,v 3.22 1998/10/02 06:15:06 dawes Exp $ +XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ /* if you want host-specific customization, this is one way to do it */ /* @@ -87,6 +87,22 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.22 1998/10/02 06:15:06 dawes Ex #define ProjectRoot /usr/X11R6 #endif +/* + * On some platforms, some things may be installed outside of ProjectRoot + * by default. To disable this, uncomment the following line. + * +#define NothingOutsideProjectRoot YES + */ + +/* + * Set EtcX11Directory if you want config file links installed under + * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, + * UseEtcX11 and UseSeparateConfDir. + * +#define EtcX11Directory ProjectRoot/etc + */ + + /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ /* #define HasXdmAuth YES */ diff --git a/xc/config/cf/sun.cf b/xc/config/cf/sun.cf index 625acd29a..7faf7be1e 100644 --- a/xc/config/cf/sun.cf +++ b/xc/config/cf/sun.cf @@ -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.50 1999/03/28 02:34:19 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.52 2000/06/20 22:08:36 dawes Exp $ #ifndef OSName # define OSName DefaultOSName @@ -238,7 +238,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # endif # endif /* OSMinorVersion > 1 */ # ifndef UseExportLists -# if OSMinorVersion > 4 +# if (OSMinorVersion > 4) && !HasGcc2 # define UseExportLists YES # else # define UseExportLists NO @@ -287,6 +287,14 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # ifndef BuildPexExt # define BuildPexExt (XsunServer || Xsun24Server) # endif +#if (OSMajorVersion > 4) +# ifdef UseGas +# define AsVISOption -Av9a +# else +# define AsVISOption -xarch=v8plus +#endif +# define AsOutputArchSize 32 +#endif #endif /* not i386Architecture */ #if OSMajorVersion >= 4 diff --git a/xc/config/cf/svr3.cf b/xc/config/cf/svr3.cf index f048b773f..3f3973eea 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.12 2000/02/29 03:08:56 dawes Exp $ +XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.13 2000/03/21 19:56:59 dawes Exp $ #ifndef HasGcc #define HasGcc YES @@ -255,6 +255,8 @@ XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.12 2000/02/29 03:08:56 dawes Exp $ #ifndef InstallManPageLong #define InstallManPageLong(file,destdir,dest) @@\ +BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ install.man:: file.man @@\ MakeDir($(DESTDIR)destdir) @@\ $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ @@ -266,6 +268,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* @@\ @@ -295,8 +299,9 @@ install.man:: list @@\ * InstallManPageAliases - generate rules to install manual page aliases. * (Make hard links on SVR3.) */ -#ifndef InstallManPageAliases -#define InstallManPageAliases(file,destdir,aliases) @@\ +#ifndef InstallManPageAliasesBase +#define InstallManPageAliasesBase(file,destdir,aliases) @@\ + install.man:: @@\ @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -306,9 +311,18 @@ install.man:: @@\ done) #endif +#ifndef InstallManPageAliases +#define InstallManPageAliases(file,destdir,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) +#endif + #ifndef InstallGenManPageAliases #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ - InstallManPageAliases(file,destdir,aliases) +InstallHtmlManPageAliases(file,aliases,suffix) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) #endif #endif /* FormattedManPages */ diff --git a/xc/config/cf/svr4.cf b/xc/config/cf/svr4.cf index c8c2327a0..30662644e 100644 --- a/xc/config/cf/svr4.cf +++ b/xc/config/cf/svr4.cf @@ -1,5 +1,5 @@ XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $ -XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.38 1999/12/08 21:36:55 robin Exp $ +XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.40 2000/06/17 01:40:39 dawes Exp $ /* * A default OS name */ @@ -133,6 +133,9 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.38 1999/12/08 21:36:55 robin Exp $ #ifndef XawI18nDefines #define XawI18nDefines -DUSE_XWCHAR_STRING #endif +#ifndef UseSmartScheduler +#define UseSmartScheduler NO +#endif #endif #ifdef i386Architecture #ifndef HasPosixRegex @@ -224,6 +227,10 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.38 1999/12/08 21:36:55 robin Exp $ #endif #endif +#ifndef SharedLibXdmGreet +#define SharedLibXdmGreet YES +#endif + #if defined(i386Architecture) || defined(PpcArchitecture) #ifndef DoLoadableServer #define DoLoadableServer YES diff --git a/xc/config/cf/xf86.rules b/xc/config/cf/xf86.rules index 3806818d2..98c11ac2f 100644 --- a/xc/config/cf/xf86.rules +++ b/xc/config/cf/xf86.rules @@ -1,5 +1,5 @@ XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $ -XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.30 1999/10/13 16:49:02 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.31 2000/03/31 22:55:15 dawes Exp $ /* * These rules are needed to build the XFree86 X Servers @@ -226,6 +226,21 @@ InstallDriverSDKDynamicModule(Concat(module,_drv.o),dest,subdir) #endif #endif + +#ifndef InstallDriverSDKObjectSubModule +#if !DoLoadableServer +#define InstallDriverSDKObjectSubModule(module,dest,subdir) /**/ +#else +#if MakeDllModules +#define InstallDriverSDKObjectSubModule(module,dest,subdir) @@\ +InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir) +#else +#define InstallDriverSDKObjectSubModule(module,dest,subdir) @@\ +InstallDriverSDKDynamicModule(Concat(module,.o),dest,subdir) +#endif +#endif +#endif + #ifndef InstallDriverSDKLibraryModule #if !DoLoadableServer #define InstallDriverSDKLibraryModule(module,dest,subdir) /**/ diff --git a/xc/config/cf/xf86site.def b/xc/config/cf/xf86site.def index a666fbdc9..d49306a04 100644 --- a/xc/config/cf/xf86site.def +++ b/xc/config/cf/xf86site.def @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.159 2000/03/07 15:23:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.162 2000/05/31 07:14:52 eich Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the @@ -125,7 +125,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.159 2000/03/07 15:23:00 dawes Exp */ /* - * To disable the internal Xserver malloc, set this to NO + * To enable the internal Xserver malloc, uncomment this * #define UseInternalMalloc YES */ @@ -255,7 +255,15 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.159 2000/03/07 15:23:00 dawes Exp neomagic i740 tdfx \ cirrus tseng trident chips apm \ GlideDriver fbdev \ - ati r128 vga XF86ExtraCardDrivers + ati r128 AgpGartDrivers cyrix \ + vga XF86OSCardDrivers XF86ExtraCardDrivers + */ + +/* + * To add third party drivers to the standard driver list, set the + * following. + * +#define XF86ExtraCardDrivers extradriver1 extradriver2 ... */ /* @@ -677,6 +685,13 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.159 2000/03/07 15:23:00 dawes Exp */ /* + * Undefine the following if you don't want to have config files and + * app-defaults installed in a separate directory (i.e. /etc/X11). + * +#define UseSeparateConfDir NO + */ + +/* * If your system doesn't support vm86() mode and you have * libx86emu set library path here * diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index 77e5e454d..2e5b32c53 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.282 2000/03/07 14:31:36 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.300 2000/06/30 19:30:15 dawes Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -34,7 +34,8 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ /* XInput drivers */ #ifndef XInputDrivers #if 1 -#define XInputDrivers mouse dynapro microtouch wacom void +#define XInputDrivers mouse dynapro elographics microtouch mutouch \ + wacom void #else #define XInputDrivers mouse dynapro elo2300 elographics magellan \ microtouch mutouch spaceorb wacom void @@ -42,6 +43,11 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ #endif /* OS.cf files may set this for OS-specific drivers */ +#ifndef XF86OSCardDrivers +#define XF86OSCardDrivers /**/ +#endif + +/* This may be set in host.def for 3rd party drivers */ #ifndef XF86ExtraCardDrivers #define XF86ExtraCardDrivers /**/ #endif @@ -137,9 +143,18 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ * support (when it is useful to do so). */ # if HasAgpGart -# define AgpGartDrivers i810 +# define AgpGartDrivers i810 # else -# define AgpGartDrivers /**/ +# define AgpGartDrivers /**/ +# endif + +/* Drivers under development, but not ready for binary releases */ +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers imstt +# else +# define DevelDrivers /**/ +# endif # endif /* Pure PCI drivers should go first */ @@ -148,8 +163,8 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ neomagic i740 tdfx \ cirrus tseng trident chips apm \ GlideDriver fbdev \ - ati r128 AgpGartDrivers cyrix \ - vga XF86ExtraCardDrivers + ati r128 AgpGartDrivers DevelDrivers cyrix \ + vga XF86OSCardDrivers XF86ExtraCardDrivers # endif #endif @@ -235,7 +250,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ /* Sparc drivers */ -#if defined(SparcArchitecture) && !defined(LynxOSArchitecture) +#if defined(SparcArchitecture) && !defined(LynxOSArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture) && !defined(SunArchitecture) # ifndef XF86Server # define XF86Server YES # endif @@ -243,6 +258,26 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ # ifndef XF1Bpp # define XF1Bpp YES # endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32wid fb module */ +# ifndef XF8_32Wid +# define XF8_32Wid 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 @@ -255,15 +290,62 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ # 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 +# define XF86RAC YES +# endif +/* Pure SBUS and PCI drivers should go first */ # ifndef XF86CardDrivers -# define XF86CardDrivers fbdev XF86ExtraCardDrivers +# define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ + sunbw2 ati glint fbdev \ + XF86OSCardDrivers XF86ExtraCardDrivers +# endif + +#endif + +/* Mips drivers */ + +#ifdef MipsArchitecture +# ifndef XF86Server +# define XF86Server YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES # endif +# ifndef XF86CardDrivers +# define XF86CardDrivers XF86OSCardDrivers XF86ExtraCardDrivers +# endif #endif /* @@ -335,7 +417,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ /* Pure PCI drivers should go first */ # ifndef XF86CardDrivers # define XF86CardDrivers mga tdfx glint s3virge rendition tga \ - r128 vga XF86ExtraCardDrivers + r128 vga XF86OSCardDrivers XF86ExtraCardDrivers # endif #endif @@ -411,7 +493,8 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ /* Pure PCI drivers should go first */ # ifndef XF86CardDrivers # define XF86CardDrivers r128 mga glint s3virge sis cirrus tseng \ - trident chips fbdev vga XF86ExtraCardDrivers + trident chips fbdev \ + vga XF86OSCardDrivers XF86ExtraCardDrivers # endif #endif @@ -512,12 +595,27 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # ifndef GlxBuiltInTdfx # define GlxBuiltInTdfx NO # endif +# ifndef GlxBuiltInMga +# define GlxBuiltInMga NO +# endif +# ifndef GlxBuiltInI810 +# define GlxBuiltInI810 NO +# endif +# ifndef GlxBuiltInR128 +# define GlxBuiltInR128 NO +# endif +# ifndef GlxBuiltInFfb +# define GlxBuiltInFfb NO +# endif +# ifndef GlxBuiltInSIS +# define GlxBuiltInSIS NO +# endif -# if GlxBuiltInTdfx +# if GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuildInFfb || GlxBuiltInSIS # define GlxDriverUsesMesa YES # endif -# if GlxBuiltInGamma || GlxBuiltInMesa || GlxBuiltInTdfx +# if GlxBuiltInGamma || GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInFfb || GlxBuiltInMesa # define GlxUseBuiltInDRIDriver YES # define DRIDynLoadDefines /**/ # else @@ -560,8 +658,14 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define GlxCoreLibDefines /**/ # endif +# if defined(SparcArchitecture) || defined(AlphaArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 +# else +# define GlxArchDefines /**/ +# endif + # ifndef GlxExtraDefines -# define GlxExtraDefines DRIDefines GlxCoreLibDefines +# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines # endif #else @@ -685,7 +789,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 * Build the XFree86-Misc extension */ #ifndef BuildXF86MiscExt -# define BuildXF86MiscExt NO +# define BuildXF86MiscExt YES #endif /* @@ -756,7 +860,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #endif #ifndef UseInternalMalloc -# define UseInternalMalloc YES +# define UseInternalMalloc NO #endif #ifndef HasDlsymBug @@ -919,6 +1023,16 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define ServerSnprintfDefines /**/ #endif +#ifndef UseSmartScheduler +#define UseSmartScheduler YES +#endif + +#if UseSmartScheduler +#define SmartScheduleDefines -DSMART_SCHEDULE +#else +#define SmartScheduleDefines /**/ +#endif + /* Server defines required for all OSs */ #ifndef XFree86ServerDefines # define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \ @@ -926,13 +1040,13 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 XFree86LoaderDefines -DXFree86Server \ VidModeExtensionDefines \ ServerSnprintfDefines \ - -DX_BYTE_ORDER=ByteOrder \ - -DSMART_SCHEDULE + SmartScheduleDefines \ + -DX_BYTE_ORDER=ByteOrder #endif #ifndef XFree86ServerOSDefines # define XFree86ServerOSDefines -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \ - -DDDXOSVERRORF -DSMART_SCHEDULE + -DDDXOSVERRORF #endif #ifndef XFree86ConsoleDefines @@ -1022,8 +1136,19 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules #endif +/* + * As of 3.9.15, XFree86 release versions are X.Y.Z, and XFree86Version is: + * + * X * 1000 + Y * 100 + Z + * + * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version + * calculated as: + * + * X * 1000 + Y * 100 + Z * 10 + W + * + */ #ifndef XFree86Version -# define XFree86Version 4000 +# define XFree86Version 4001 #endif #ifndef XVendorString |