Commit 4394c889 authored by alanh's avatar alanh
Browse files

Import of XFree86 4.2.99.2

parent 37d6f977
......@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
XCOMM $XFree86: xc/Imakefile,v 3.25 2001/03/21 17:36:43 dawes Exp $
XCOMM $XFree86: xc/Imakefile,v 3.26 2002/05/31 18:45:38 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......@@ -46,7 +46,6 @@ DependSubdirs($(SUBDIRS))
#define IHaveSpecialMakefileTarget
#ifndef Win32Architecture
#ifndef OS2Architecture
VerifyOS::
@echo ""
@echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")."
......@@ -65,9 +64,15 @@ VerifyOS::
#endif
#ifdef XFree86Version
#ifndef OS2Architecture
version.def::
$(RM) $(IRULESRC)/version.def
$(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
#else /*OS2Architecture*/
version.def::
$(RM) $(IRULESRC)/version.def
$(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
#endif
#else
version.def::
#endif
......@@ -118,53 +123,6 @@ dangerous_strip_clean::
find . -type l -exec rm {} \;
find . \( \! -type d \) -print
#else /* OS2Architecture */
VerifyOS::
@echo :
@echo Building on OSName.
@echo :
includes::
MakeDir($(subst /,\,$(BUILDINCDIR)))
XCOMM
XCOMM Watch out!!! Make sure you do make includes after removing X11....
XCOMM
clean::
$(RM) -r $(BUILDINCDIR)
$(RM) -r $(BUILDLIBDIR)
Everything::
@echo :
@echo Building $(RELEASE) of the X Window System on OS/2
@echo :
@echo :
\indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS=-Zexe
if exist Makefile.bak del Makefile.bak
if exist Makefile ren Makefile Makefile.bak
$(MAKE) $(MFLAGS) -f Makefile.bak Makefile
$(MAKE) $(MFLAGS) SHELL= VerifyOS
$(MAKE) $(MFLAGS) SHELL= Makefiles
$(MAKE) $(MFLAGS) SHELL= clean
$(MAKE) $(MFLAGS) SHELL= includes
$(MAKE) $(MFLAGS) SHELL= depend
$(MAKE) $(MFLAGS)
@echo :
@echo :
@echo Rebuild of $(RELEASE) of the X Window System complete.
@echo :
#ifdef ProjectRoot
install::
MakeDir($(subst /,\,$(PROJECTROOT)))
#endif
install::
MakeDir($(subst /,\,$(INCROOT)))
MakeDir($(subst /,\,$(USRLIBDIR)))
MakeDir($(subst /,\,$(LIBDIR)))
#endif
#else /* not Win32Architecture else */
VerifyOS::
@echo :
......
......@@ -788,7 +788,7 @@ the Xft man page.
4.11.2 FreeType support in Xft
XFree86 4.2.0 includes sources for FreeType version 2.0.1, and, by default,
XFree86 4.2.0 includes sources for FreeType version 2.0.6, and, by default,
they are built and installed automatically.
If you prefer, you can configure XFree86 4.2.0 to use an existing Freetype2
......@@ -813,14 +813,11 @@ Render extension and the Xft and FreeType libraries to provide anti-aliased
text. Xterm, xditview and x11perf. Migration of other applications may
occur in future releases.
By default, xterm uses core fonts through the standard core API. It has two
command line options and associated resources to direct it to use Xft
instead:
By default, xterm uses core fonts through the standard core API. It has a
command line option and associated resource to direct it to use Xft instead:
o -fa family / .VT100.faceName: family. Selects the font family to use.
o -fs pointsize / .VT100.faceSize: pointsize. Selects the pointsize.
Xditview will use Xft instead of the core API by default. X11perf includes
tests to measure the performance of text rendered in three ways, anti-
aliased, anti-aliased with sub-pixel sampling and regular chunky text, but
......@@ -1046,7 +1043,7 @@ location pointing to the new location. Some run-time generated files are now
located under the appropriate subdirectories of /var, again with the relevant
symbolic links in the old location.
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.70 2002/01/17 18:14:59 dawes Exp $
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.71 2002/01/21 19:01:35 dawes Exp $
$XFree86: xc/RELNOTES,v 1.6 2002/01/17 23:27:41 dawes Exp $
$XFree86: xc/RELNOTES,v 1.7 2002/01/22 22:26:02 dawes Exp $
......@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
XCOMM
XCOMM
XCOMM
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.112 2002/01/03 16:33:49 tsi Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.121 2002/09/12 17:23:53 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -43,11 +43,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define GccUsesGas YES
#define UseGas YES
#define GnuCpp YES
#define HasPoll YES
#define HasNdbm YES
#define HasPutenv YES
#define HasSnprintf YES
#define HasBSD44Sockets YES
#define HasDlopen YES
#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012)
#define HasSetProcTitle YES
#endif
#ifndef HasLibCrypt
# define HasLibCrypt YES
#endif
......@@ -60,6 +64,14 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasVarRun YES
#define HasVarDb YES
#if (OSMajorVersion >= 3)
#define HasIssetugid YES
#endif
#if OSMajorVersion >= 4
#define HasGetIfAddrs YES
#endif
#if (OSMajorVersion > 1)
#define InstallXloadSetGID NO
#else
......@@ -77,9 +89,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif
# define HasPosixThreads YES
# define ThreadedX YES
/*
* math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
*/
# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
/*
* FreeBSD has tread-safe api but no getpwnam_r yet.
......@@ -91,8 +100,11 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# else
# define BuildThreadStubLibrary YES
# define NeedUIThrStubs YES
# define ThreadsCompileFlags -pthread
# define ThreadsLibraries -pthread
# if (OSRelVersion >= 500016)
# define ThreadsLibraries -lc_r
# else
# define ThreadsLibraries -pthread
# endif
# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
# endif
......@@ -144,7 +156,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
*
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
#if BuildThreadStubLibrary && !UseInstalled
#if BuildThreadStubLibrary && !UseInstalledX11
# define CcCmd $(CLIENTENVSETUP) cc
# define CplusplusCmd $(CLIENTENVSETUP) c++
#else
......@@ -187,6 +199,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasSetUserContext YES
#endif
#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 6)
#define HasGetpeereid YES
#endif
/* 3.3(?) and later has support for setting MTRRs */
#ifndef HasMTRRSupport
#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 3)
......@@ -216,6 +232,21 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#endif
/*
* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only
* requirement for enabling this. By 4.2 they were all supported.
*/
#ifdef i386Architecture && \
(OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2))
# define HasMMXSupport YES
# define Has3DNowSupport YES
# define HasKatmaiSupport YES
#else
# define HasMMXSupport NO
# define Has3DNowSupport NO
# define HasKatmaiSupport NO
#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
......@@ -521,8 +552,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifndef PreloadFontSetup
#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libXfont*.so.?)`"
#endif
#ifndef PreloadSetup
#define PreloadSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo lib[A-f]*.so.? | grep -v Xfont)`"
#ifndef PreloadXFTSetup
#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libfreetype.so.? libXft.so.? libXrender.so.? libfontconfig.so.?)`"
#endif
#endif
......@@ -540,7 +571,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
/*
* A hack to work around an optimization problem with gcc 2.95.2
*/
#if OSMajorVersion >= 4
#if OSMajorVersion == 4
#define GccOptBug295
#endif
......
......@@ -17,7 +17,7 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
*
* 4. Create a .cf file with the name given by MacroFile.
*/
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.74 2001/11/16 16:47:50 dawes Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.78 2002/08/06 13:32:08 herrb Exp $
#if defined(__APPLE__)
# undef __APPLE__
......@@ -47,6 +47,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.74 2001/11/16 16:47:50 dawes Exp $
#define cygwinArchitecture
#define i386Architecture
#undef i386
#undef i486
#undef i586
#undef i686
#undef __i386__
#undef _X86_
#undef __CYGWIN__
......@@ -187,6 +190,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.74 2001/11/16 16:47:50 dawes Exp $
# endif
# ifdef __alpha__
# define AlphaArchitecture
# define AlphaBsdArchitecture
# undef __alpha__
# endif
# ifdef mc68000
......@@ -706,6 +710,12 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# endif
# undef __k6
# endif /* __k6 */
XCOMM Keep this order! s390x has also __s390__ defined.
# if defined(__s390x__)
# define s390xArchitecture
# undef __s390x__
# undef __s390__
# endif
# ifdef __s390__
# define s390Architecture
# undef __s390__
......@@ -815,6 +825,16 @@ XCOMM for compatibility with 3.3.x
# define s390xArchitecture
# undef __s390x__
# endif
# if defined(__x86_64__)
# undef __x86_64__
# define x86_64Architecture
# endif
# if defined(x86_64__)
# undef x86_64__
# ifndef x86_64Architecture
# define x86_64Architecture
# endif
# endif
#endif /* linux */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.102 2001/12/17 20:00:37 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.110 2002/10/16 01:45:28 dawes Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -44,6 +44,7 @@ XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.102 2001/12/17 20:00:37 daw
* ProofCleanTarget ()
* RemoveTargetProgram (program)
* MakeDir (dir)
* InstallDirectory (dir)
* BuildIncludesTop (srclist)
* BuildIncludes (srclist,dstsubdir,dstupdir)
* LinkRule (program,options,objects,libraries)
......@@ -118,6 +119,7 @@ XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.102 2001/12/17 20:00:37 daw
* ObjectCompile (options)
* NormalLibObjCompile (options)
* NormalSharedLibObjCompile (options)
* NormalRelocLibObjCompile (options)
* LibObjCompile (dir,options)
* DebuggedLibObjCompile (options)
* ProfiledLibObjCompile (options)
......@@ -525,6 +527,12 @@ clean cleantc:: @@\
fi
#endif /* MakeDir */
#ifndef InstallDirectory
#define InstallDirectory(dir) @@\
install:: @@\
MakeDir(dir)
#endif /* InstallDirectory */
#ifndef BuildIncludesTop
#define BuildIncludesTop(srclist) @@\
includes:: srclist @@\
......@@ -778,6 +786,20 @@ InstallProgram(program,$(BINDIR)) @@\
InstallManPage(program,$(MANDIR))
#endif /* CplusplusProgramTargetHelper */
#ifndef CplusplusProgramTargetHelperNoMan
#define CplusplusProgramTargetHelperNoMan(program,srcs,objs,deplib,locallib,syslib) @@\
ProgramTargetName(program): $(objs) $(deplib) @@\
RemoveTargetProgram($@) @@\
CplusplusLinkRule($@,$(CXXLDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\
@@\
CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib) @@\
SentinelCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
PurifyCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
ProofCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
@@\
InstallProgram(program,$(BINDIR)) @@
#endif /* CplusplusProgramTargetHelperNoMan */
/*
* ComplexProgramTarget - generate rules for compiling and linking the
* program specified by $(OBJS) and $(SRCS), installing the program and its
......@@ -786,9 +808,9 @@ InstallManPage(program,$(MANDIR))
*/
#ifndef ComplexProgramTarget
#define ComplexProgramTarget(program) @@\
PROGRAM = program @@\
PROGRAM = ProgramTargetName(program) @@\
@@\
AllTarget(program) @@\
AllTarget(ProgramTargetName(program)) @@\
@@\
ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
@@\
......@@ -801,9 +823,9 @@ clean:: @@\
#ifndef ComplexCplusplusProgramTarget
#define ComplexCplusplusProgramTarget(program) @@\
PROGRAM = program @@\
PROGRAM = ProgramTargetName(program) @@\
@@\
AllTarget(program) @@\
AllTarget(ProgramTargetName(program)) @@\
@@\
CplusplusProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
@@\
......@@ -818,13 +840,13 @@ clean:: @@\
* ComplexProgramTargetNoMan - generate rules for compiling and linking
* the program specified by $(OBJS) and $(SRCS), installing the program
* and generating dependencies. It should only be used in Imakefiles
* that describe a single program.
* that describe a single program, and have no manual page.
*/
#ifndef ComplexProgramTargetNoMan
#define ComplexProgramTargetNoMan(program) @@\
PROGRAM = program @@\
PROGRAM = ProgramTargetName(program) @@\
@@\
AllTarget(program) @@\
AllTarget(ProgramTargetName(program)) @@\
@@\
ProgramTargetHelperNoMan(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
@@\
......@@ -835,6 +857,21 @@ clean:: @@\
RemoveFile(ProgramTargetName(program))
#endif /* ComplexProgramTargetNoMan */
#ifndef ComplexCplusplusProgramTarget
#define ComplexCplusplusProgramTarget(program) @@\
PROGRAM = program @@\
@@\
AllTarget(program) @@\
@@\
CplusplusProgramTargetHelperNoMan(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
@@\
DependTarget() @@\
LintTarget() @@\
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program))
#endif /* ComplexCplusplusProgramTarget */
/*
* ComplexProgramTarget_1 - generate rules for compiling and linking the
* program specified by $(OBJS1) and $(SRCS1), installing the program and its
......@@ -1376,8 +1413,8 @@ InstallGenManPageLong(file,destdir,file,suffix)
NoCmpScript(ProgramTargetName($(RMAN))) @@\
@@\
ProgramTargetName($(RMAN)): @@\
@echo "checking $@ over in $(TOP)/config/util first..."; \ @@\
cd $(TOP)/config/util && $(MAKE) rman; \ @@\
@echo "checking $(RMANBASENAME) over in $(TOP)/config/util first..."; \ @@\
cd $(TOP)/config/util && $(MAKE) $(RMANBASENAME); \ @@\
echo "okay, continuing in $(CURRENT_DIR)"
#endif /* UseInstalled */
......@@ -1588,7 +1625,7 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname)
#ifndef MakeFlagsToShellFlags
#define MakeFlagsToShellFlags(makeflags,shellcmd)\
for flag in ${MAKEFLAGS} ''; do \ @@\
case "$$flag" in *=*) ;; *[makeflags]*) shellcmd;; esac; done
case "$$flag" in *=*) ;; --*) ;; *[makeflags]*) shellcmd;; esac; done
#endif
/*
......@@ -2129,6 +2166,14 @@ LintLibReferences(varname,libname,libsource)
#define NormalLibObjCompile(options) ObjectCompile(options)
#endif
#ifndef NormalRelocLibObjCompile
# if !StaticNeedsPicForShared
# define NormalRelocLibObjCompile(options) NormalLibObjCompile(options)
# else
# define NormalRelocLibObjCompile(options) NormalLibObjCompile(options $(PICFLAGS))
# endif
#endif
#ifndef NormalLibObjCplusplusCompile
#define NormalLibObjCplusplusCompile(options) ObjectCplusplusCompile(options)
#endif
......@@ -3352,7 +3397,7 @@ AllTarget(module) @@\
@@\
install:: module @@\
MakeDir($(DESTDIR)dest/subdir) @@\
$(INSTALL) -c module $(DESTDIR)dest/subdir
$(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir
#endif
#ifndef InstallDynamicNamedModule
......@@ -3362,7 +3407,7 @@ AllTarget(module) @@\
@@\
install:: module @@\
MakeDir($(DESTDIR)dest/subdir) @@\
$(INSTALL) -c module $(DESTDIR)dest/subdir/instname
$(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir/instname
#endif
#ifndef InstallObjectModule
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.116 2002/01/15 21:22:33 keithp Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.130 2002/10/12 16:06:38 herrb Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -45,6 +45,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#include <site.def>
#undef BeforeVendorCF
#if defined(HasGcc3) && !defined(HasGcc2)
# define HasGcc2 HasGcc3
#endif
#if defined(HasGcc2) && !defined(HasGcc)
# define HasGcc HasGcc2
#endif
......@@ -301,6 +304,7 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef CrossCompiling
#define CrossCompiling NO
#undef CrossCompileDir
#endif
#ifndef BourneShell /* to force shell in makefile */
#define BourneShell /bin/sh
......@@ -359,6 +363,10 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasPutenv
#define HasPutenv NO /* assume not */
#endif
/* setenv(3) and unsetenv(3) */
#ifndef HasSetenv
#define HasSetenv YES /* assume yes */
#endif
#ifndef HasVoidSignalReturn
#define HasVoidSignalReturn YES /* assume yes */
#endif
......@@ -371,12 +379,21 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasDlopen
#define HasDlopen NO /* assume not */
#endif
#ifndef HasIssetugid
#define HasIssetugid NO /* assume not */
#endif
#ifndef HasGetresuid
#define HasGetresuid NO /* assume not */
#endif
#ifndef HasMkstemp
#define HasMkstemp NO /* assume not */
#endif
#ifndef HasUsableFileMmap
#define HasUsableFileMmap NO /* assume not */
#endif
#ifndef HasGetIfAddrs
#define HasGetIfAddrs NO /* assume not */
#endif
#ifndef HasStickyDirBit
#define HasStickyDirBit YES
#endif
......@@ -389,6 +406,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasPamMisc
#define HasPamMisc NO
#endif
#ifndef HasGetpeereid
#define HasGetpeereid NO
#endif
/* byte-order defaults */
#ifndef ByteOrder
#if defined(VaxArchitecture)
......@@ -401,6 +421,8 @@ XCOMM the platform-specific parameters - edit site.def to change
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(ia64Architecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(x86_64Architecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(SparcArchitecture) || defined(Sparc64Architecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(AlphaArchitecture)
......@@ -484,12 +506,23 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef HasFreetype2
#define HasFreetype2 NO
#endif
/* If the system has the Fontconfig library */
#ifndef HasFontconfig
#define HasFontconfig NO
#endif
/* If the system has the libxml2 library */
#ifndef HasLibxml2
#define HasLibxml2 NO
#endif
#ifndef HasLibpng
#define HasLibpng NO
#endif
#if HasKrbIV
#ifndef KrbIVIncludes
#define KrbIVIncludes /**/
#endif
#ifndef KrbIVLibraries
#define KrbIVLibraries -lkafs -lkrb -ldes
#define KrbIVLibraries -lkrb -ldes
#endif
#endif
#if HasKrb5
......@@ -688,14 +721,18 @@ TCLIBDIR = TclLibDir
#define DefaultUsrBin /usr/bin
#endif
#ifndef LibDirName
# define LibDirName lib
#endif
#ifndef UsrLibDir
#ifdef ProjectRoot
#define UsrLibDir Concat(ProjectRoot,/lib)
#define UsrLibDir Concat3(ProjectRoot,/,LibDirName)
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir YES
#endif
#else
#define UsrLibDir /usr/lib
#define UsrLibDir Concat3(/usr,/,LibDirName)
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO
#endif
......@@ -789,6 +826,9 @@ TCLIBDIR = TclLibDir
#ifndef AppLoadDefs
#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
#endif
#ifndef LibManDefs
#define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX)
#endif
#ifndef FileManDefs
#define FileManDefs -D__filemansuffix__=$(FILEMANSUFFIX)
#endif
......@@ -948,8 +988,11 @@ TCLIBDIR = TclLibDir
#ifndef BootstrapCFlags
#define BootstrapCFlags /**/
#endif
#ifndef HasGcc3
#define HasGcc3 NO
#endif
#ifndef HasGcc2
#define HasGcc2 NO
#define HasGcc2 HasGcc3
#endif
#ifndef HasGcc
#define HasGcc HasGcc2
......@@ -1166,6 +1209,9 @@ TCLIBDIR = TclLibDir
#define ModuleRanlibCmd RanlibCmd
#endif
#ifndef HostCcCmd
#define HostCcCmd cc
#endif
#ifndef StandardIncludes /* for platform-specifics */
#define StandardIncludes /**/
#endif
......@@ -1209,18 +1255,18 @@ TCLIBDIR = TclLibDir
#endif
#endif
#ifndef LdPreLib
#if !defined(UseInstalled)
#if !BuildLibraries && AlternateUsrLibDir
#define LdPreLib -L$(BUILDLIBDIR) -L$(USRLIBDIR)
#else
#define LdPreLib -L$(BUILDLIBDIR)
#endif
#else
#if AlternateUsrLibDir
#define LdPreLib -L$(USRLIBDIR)
#else
#define LdPreLib /**/
#endif
# if !defined(UseInstalled)
# if !BuildLibraries && AlternateUsrLibDir
# define LdPreLib -L$(BUILDLIBDIR) -L$(USRLIBDIR)
# else
# define LdPreLib -L$(BUILDLIBDIR)
# endif
# else
# if AlternateUsrLibDir
# define LdPreLib -L$(USRLIBDIR)
# else
# define LdPreLib /**/
# endif
#endif
#endif
#ifndef LdPostLib
......@@ -1470,6 +1516,59 @@ TCLIBDIR = TclLibDir
#endif
#ifndef FilesToClean
#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
#endif
#ifdef CrossCompileDir
# ifndef StripPath
# define StripPath(x) `echo x|sed "s%.*/%%"`
# endif
# ifndef CrossArCmd
# define CrossArCmd Concat3(CrossCompileDir,/,StripPath(ArCmd))
# endif
# ifndef CrossCcCmd
# define CrossCcCmd Concat3(CrossCompileDir,/,StripPath(CcCmd))
# endif
# ifndef CrossAsCmd
# define CrossAsCmd Concat3(CrossCompileDir,/,StripPath(AsCmd))
# endif
# ifdef HasFortran
# ifndef CrossFortranCmd
# define CrossFortranCmd Concat3(CrossCompileDir,/,StripPath(FortranCmd))
# endif