Commit fb3f114f authored by alanh's avatar alanh
Browse files

Import of XFree86 4.3.99.12

parent d5935687
......@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
XCOMM $XFree86: xc/Imakefile,v 3.29 2003/02/26 09:21:31 dawes Exp $
XCOMM $XFree86: xc/Imakefile,v 3.30 2003/08/24 20:31:43 tsi Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......@@ -73,6 +73,7 @@ VerifyOS::
@echo ""
#endif
#ifdef XFree86Version
#ifndef OS2Architecture
version.def::
$(RM) $(IRULESRC)/version.def
......@@ -86,6 +87,9 @@ version.def::
$(CP) $(XF86SRC)/xf86Version.h $(IRULESRC)/version.def
$(CP) $(XF86SRC)/xf86Date.h $(IRULESRC)/date.def
#endif
#else
version.def::
#endif
includes::
MakeDir($(BUILDINCDIR))
......
X Window System, Version 11
Release 6.4
Release 6.6
Portions Copyright by:
......
......@@ -2,7 +2,7 @@
# $XFree86: xc/Makefile,v 3.27 2003/02/26 09:21:31 dawes Exp $
# $XFree86: xc/Makefile,v 3.28 2003/04/15 03:15:55 dawes Exp $
# Luna users will need to either run make as "make MAKE=make"
# or add "MAKE = make" to this file.
......@@ -11,7 +11,7 @@ RELEASE = "Release 6.6"
SHELL = /bin/sh
RM = rm -f
MV = mv
WORLDOPTS = -k
WORLDOPTS =
WIN32WORLDOPTS = -i
TOP = .
CURRENT_DIR = .
......
......@@ -186,7 +186,7 @@ here.
o Various Cygwin support updates, including an experimental rootless X
server for Cygwin/XFree86.
o AMD x86-64 support (primarily for Linux so far) has been added.
o AMD AMD64 support (primarily for Linux so far) has been added.
o Support added for OpenBSD/sparc64.
......@@ -930,7 +930,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.81 2003/02/27 00:45:05 dawes Exp $
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.82 eich Exp $
$XFree86: xc/RELNOTES,v 1.17 2003/02/27 01:44:02 dawes Exp $
$XFree86: xc/RELNOTES,v 1.19 2003/07/15 02:28:26 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.128 2003/01/15 02:52:12 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.133 2003/08/29 14:38:32 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -111,10 +111,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define ThreadsLibraries -pthread
# endif
# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
# endif
#endif
/* This fixes linking C programs against libGLU on FreeBSD 3.x */
#if (OSMajorVersion == 3)
#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++ -lgcc
#endif
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
......@@ -324,117 +329,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#endif
/*
* For FreeBSD 2.2.5 and later don't make any assumptions about the version
* of Tcl in the base OS.
*
* Note the static libs in some versions of the FreeBSD packages are
* broken. The symptom of this is unresolved symbols when linking
* XF86Setup. If you run into this problem, either build your own
* static libs from the standard Tcl and Tk source, or change the
* definitions of XF86SetupUsesStatic{Tcl,Tk}. The latter is not
* recommended for binaries that are going to be redistributed.
*/
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 2) || \
(OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion > 5)
/*
* For 2.2.6, 3.0 and later the defaults assume that the tcl-8.0 and tk-8.0
* packages have been installed. XF86Setup is much faster with 8.x than
* with earlier versions.
*
*/
#ifndef TkLibName
#define TkLibName tk80
#endif
#ifndef TkIncDir
#define TkIncDir /usr/local/include/tk8.0
#endif
#ifndef TclLibName
#define TclLibName tcl80
#endif
#ifndef TclIncDir
#define TclIncDir /usr/local/include/tcl8.0
#endif
#elif OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion > 2
/*
* For 2.2.5, the defaults assume that the tcl-7.6 and tk-4.2
* packages have been installed.
*/
#ifndef TkLibName
#define TkLibName tk42
#endif
#ifndef TkIncDir
#define TkIncDir /usr/local/include/tk4.2
#endif
#ifndef TclLibName
#define TclLibName tcl76
#endif
#ifndef TclIncDir
#define TclIncDir /usr/local/include/tcl7.6
#endif
#elif OSMajorVersion == 2 && OSMinorVersion == 2
/*
* FreeBSD 2.2 prior to 2.2.5
*
* tcl is part of the base OS.
*
* Note: the tk-4.1 package for FreeBSD doesn't have the static lib, so
* you'll have to build it yourself, or change the definition of
* XF86SetupUsesStaticTk.
*/
#ifndef TkLibName
#define TkLibName tk41
#endif
#ifndef TclLibName
#define TclLibName tcl
#endif
#ifndef TclLibDir
#define TclLibDir /usr/lib
#endif
#ifndef TclIncDir
#define TclIncDir /usr/include
#endif
/* FreeBSD 2.2 has libtcl in the base system */
#ifndef XF86SetupUsesStaticTcl
#define XF86SetupUsesStaticTcl NO
#endif
#else /* ! 2.2 or later */
#if OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 6
/*
* 2.1.x with x >=6 has tk 4.1 and tcl 7.5 in the packages collection.
* Neither packages include the static libs, so you either need to build
* them yourself or set XF86SetupUsesStaticTcl and XF86SetupUsesStaticTk
* to NO. This isn't the default because we don't want the XFree86
* binaries to have these packages as a dependency.
*/
#ifndef TkLibName
#define TkLibName tk41
#endif
#ifndef TclLibName
#define TclLibName tcl75
#endif
#else /* ! 2.1.6 or later */
#ifndef TkLibName
#define TkLibName tk40
#endif
#ifndef TclLibName
#define TclLibName tcl74
#endif
#endif
#endif
#undef InstallCmd
#define InstallCmd /usr/bin/install
......@@ -566,6 +460,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifndef PreloadFontSetup
#define PreloadFontSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libXfont*.so.?)`"
#endif
#ifndef PreloadFreetypeSetup
#define PreloadFreetypeSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libfreetype.so.?)`"
#endif
#ifndef PreloadXFTSetup
#define PreloadXFTSetup LD_PRELOAD="`(cd $(XENVLIBDIR); echo libfreetype.so.? libXft.so.? libXrender.so.? libfontconfig.so.?)`"
#endif
......@@ -585,7 +482,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
/*
* A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
*/
#if OSMajorVersion == 4
#if (GccMajorVersion == 2 && GccMinorVersion == 95)
#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.81 2003/02/18 16:51:45 tsi Exp $
XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.83 2003/07/07 15:34:20 eich Exp $
#if defined(__APPLE__)
# undef __APPLE__
......@@ -302,6 +302,25 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $
# define SVR3Architecture
# define i386ScoArchitecture
# define i386Sco325Architecture
# undef i386
# undef i486
# undef i586
# undef i686
# undef k6
# undef __i386__
# undef __i486__
# undef __i586__
# undef __i686__
# undef __k6__
# undef __i386
# undef __i486
# undef __i586
# undef __i686
# undef __k6
# undef pentium
# undef __pentium
# undef pentiumpro
# undef __pentiumpro
#endif /* sco - SCO Open Server 5 */
#ifdef USL
......@@ -832,14 +851,16 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
# define s390xArchitecture
# undef __s390x__
# endif
# if defined(__x86_64__)
# if defined(__AMD64__) || defined (__x86_64__)
# undef __AMD64__
# undef __x86_64__
# define x86_64Architecture
# define AMD64Architecture
# endif
# if defined(x86_64__)
# if defined(AMD64__) || defined (x86_64__)
# undef AMD64__
# undef x86_64__
# ifndef x86_64Architecture
# define x86_64Architecture
# ifndef AMD64Architecture
# define AMD64Architecture
# endif
# endif
#endif /* linux */
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.113 2002/12/09 23:00:42 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.121 2003/09/01 21:19:59 tsi Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -327,7 +327,7 @@ XCOMM special target for clearmake @@\
#endif
#ifndef RunPerlScript
#define RunPerlScript(script,options) $(PERL) $(PERLOPTS) script options
#define RunPerlScript(script,options) $(PERLENVSETUP) $(PERL) $(PERLOPTS) script options
#endif
#ifndef RemoveFile
......@@ -338,6 +338,15 @@ XCOMM special target for clearmake @@\
#define RemoveFiles(files) $(RM) files
#endif /* RemoveFiles */
#if RemoveObsoleteFiles
#define RemoveOldFile(new,old,dir) @@\
@if [ -f new ]; then set -x; \ @@\
RemoveFile($(DESTDIR)dir/old); \ @@\
fi
#else
#define RemoveOldFile(new,old,dir) $(_NULLCMD_)
#endif
/*
* CenterLoadTarget - generate rules to load files into CodeCenter
*/
......@@ -527,6 +536,17 @@ clean cleantc:: @@\
fi
#endif /* MakeDir */
#ifndef MakeDirInline
#define MakeDirInline(dir) if [ -d dir ]; then \ @@\
:; \ @@\
else \ @@\
if [ -h dir ]; then \ @@\
(set -x; rm -f dir); \ @@\
fi; \ @@\
(set -x; $(MKDIRHIER) dir); \ @@\
fi
#endif /* MakeDirInline */
#ifndef InstallDirectory
#define InstallDirectory(dir) @@\
install:: @@\
......@@ -1947,7 +1967,7 @@ depend:: @@\
#ifndef CleanTarget
#define CleanTarget() @@\
clean:: @@\
$(RM) FilesToClean ExtraFilesToClean "#"* @@\
$(RM) FilesToClean ExtraFilesToClean DocFilesToClean "#"* @@\
@@\
ProofCleanTarget()
#endif /* CleanTarget */
......@@ -2340,6 +2360,58 @@ clean:: @@\
RemoveFile(dst.c)
#endif /* ObjectFromSpecialSource */
#ifndef CPPOnlyAsm
#define CPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\
$(CPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \ @@\
grep -v '^\#' > basename.i
#endif
#ifndef AssembleObject
#define AssembleObject(flags) CPPOnlyAsm($*,flags) @@\
RemoveFile($*.o) @@\
$(AS) -o $*.o $*.i @@\
RemoveFile($*.i)
#endif
#ifndef NormalAsmObjectRule
#define NormalAsmObjectRule() @@\
.S.o: @@\
AssembleObject($(_NOOP_)) @@\
@@\
.S.i: @@\
CPPOnlyAsm($*,$(_NOOP_))
#endif
#ifndef ObjectFromSpecialAsmSource
#define ObjectFromSpecialAsmSource(dst,src,flags) @@\
dst.S: src.S @@\
RemoveFile($@) @@\
$(LN) $? $@ @@\
@@\
dst.o: dst.S @@\
AssembleObject(flags) @@\
@@\
dst.i: dst.S @@\
CPPOnlyAsm(dst,flags) @@\
@@\
depend:: dst.S @@\
@@\
clean:: @@\
RemoveFile(dst.S)
#endif
#ifndef ObjectFromAsmSource
#define ObjectFromAsmSource(src,flags) @@\
@@\
src.o: src.S @@\
AssembleObject(flags) @@\
@@\
src.i: src.S @@\
CPPOnlyAsm(src,flags) @@\
@@\
depend:: src.S
#endif
#ifndef SwitchYYPrefix
#define SwitchYYPrefix(in,out,prefix) \
sed 's/yy/prefix/g' in | sed 's/__REALLY_YY__/yy/' > out && RemoveFile(in)
......@@ -2485,6 +2557,16 @@ clean:: @@\
#endif
#endif /* LinkBuildLibrary */
#ifndef LinkBuildLibraryInline
#ifdef UseInstalled
#define LinkBuildLibraryInline(lib) true
#else
#define LinkBuildLibraryInline(lib) MakeDirInline($(BUILDLIBDIR)); \ @@\
RemoveFile($(BUILDLIBDIR)/lib); \ @@\
(cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .)
#endif
#endif /* LinkBuildLibraryInline */
#ifndef LinkBuildLibraryMaybe
#ifdef UseInstalled
#define LinkBuildLibraryMaybe(lib,doit) $(_NULLCMD_)
......@@ -3145,10 +3227,16 @@ MakeMakeSubdirs(dirs,Makefiles)
/*
* Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
* to cpp, because that trick does not work on all ANSI C preprocessors.
* Also delete line numbers from the cpp output (-P is not portable, I guess).
* Delete line numbers from the cpp output (-P is not portable, I guess).
* Allow XCOMM to be preceded by whitespace and provide a means of generating
* output lines with trailing backslashes.
*/
#ifndef CppSedMagic
#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' \
-e '/^#line *[0-9][0-9]* *.*$$/d' \
-e '/^[ ]*XCOMM$$/s/XCOMM/#/' \
-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' \
-e '/\@\@$$/s/\@\@$$/\\/'
#endif /* CppSedMagic */
#ifndef CppFileTarget
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.139 2003/01/28 22:06:08 alanh Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.145 2003/06/12 14:12:24 eich Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -120,6 +120,10 @@ XCOMM the platform-specific parameters - edit site.def to change
#define NothingOutsideProjectRoot NO
#endif
#ifndef RemoveObsoleteFiles
#define RemoveObsoleteFiles YES
#endif
#ifndef HasVarDirectory
#define HasVarDirectory YES
#endif
......@@ -223,6 +227,10 @@ XCOMM the platform-specific parameters - edit site.def to change
#define PerlOptions /**/
#endif
#ifndef PerlEnvSetup
#define PerlEnvSetup env LC_ALL=C
#endif
#ifndef BuildRman
#define BuildRman YES
#endif
......@@ -450,6 +458,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#ifndef NoStrstr
#define NoStrstr NO
#endif
#ifndef HasShadowPasswd
#define HasShadowPasswd NO
#endif
/* byte-order defaults */
#ifndef ByteOrder
#if defined(VaxArchitecture)
......@@ -462,7 +473,7 @@ 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)
#elif defined(AMD64Architecture)
#define ByteOrder X_LITTLE_ENDIAN
#elif defined(SparcArchitecture) || defined(Sparc64Architecture)
#define ByteOrder X_BIG_ENDIAN
......@@ -490,6 +501,8 @@ XCOMM the platform-specific parameters - edit site.def to change
#define ByteOrder X_BIG_ENDIAN
#endif
#endif /* ByteOrder */
X_BYTE_ORDER = ByteOrder
#ifndef HasFortran
#define HasFortran NO
#endif
......@@ -1424,6 +1437,16 @@ TCLIBDIR = TclLibDir
#ifndef NroffCmd
#define NroffCmd nroff
#endif
#ifndef HTMLroffCmd
#if HasGroff
#define HTMLroffCmd groff -Thtml
#endif
#endif
#ifdef HTMLroffCmd
#ifndef DocFilesToClean
#define DocFilesToClean grohtml*.png *-auto-*.png
#endif
#endif
#ifndef MsMacros
#define MsMacros -ms
#endif
......@@ -1451,6 +1474,15 @@ TCLIBDIR = TclLibDir
#ifndef LatexCmd
#define LatexCmd latex
#endif
#ifndef GhostScriptCmd
#define GhostScriptCmd gs
#endif
#ifndef HasGhostScript
#define HasGhostScript NO
#endif
#if HasGhostScript
#define PsToPdfCmd GhostScriptCmd -q -sOutputFile=- -sDEVICE=pdfwrite -dSAFER -dNOPAUSE -
#endif
#if HasSentinel
#ifndef SentinelCmd
#define SentinelCmd sentinel
......@@ -1542,6 +1574,9 @@ TCLIBDIR = TclLibDir
#ifndef ExtraFilesToClean
#define ExtraFilesToClean /**/
#endif
#ifndef DocFilesToClean
#define DocFilesToClean /**/
#endif
#ifndef FilesToClean
#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut
#endif
......@@ -1730,6 +1765,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
RM = RmCmd
PERL = PerlCmd
PERLOPTS = PerlOptions
PERLENVSETUP = PerlEnvSetup
MANSUFFIX = ManSuffix /* suffix for command man pages */
LIBMANSUFFIX = LibManSuffix /* suffix for library man pages */
FILEMANSUFFIX = FileManSuffix /* suffix for file format man pages */
......@@ -1743,6 +1779,12 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
TROFF = TroffCmd
NROFF = NroffCmd
#ifdef HTMLroffCmd
HTMLROFF = HTMLroffCmd
#endif
#ifdef PsToPdfCmd
PSTOPDFCMD = PsToPdfCmd
#endif
MSMACROS = MsMacros
MANMACROS = ManMacros
TBL = TblCmd
......
......@@ -19,7 +19,7 @@ XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.21 2003/01/04 02:48:24 dawes Exp $
XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.23 2003/05/25 03:12:21 dawes Exp $
#ifndef DoNormalLib
#define DoNormalLib NO
......@@ -164,7 +164,9 @@ CXXLIBDEBUGFLAGS = LibraryDebugOpt
# endif
#endif
#ifdef LibraryMTDefines
LIB_MT_DEFINES = LibraryMTDefines
#endif
#if defined(IHaveSubdirs) && HasSymLinks && !defined(NoLibSubdirs)
#define _LibMkdir LibMkdirLinkSubdirs
......@@ -459,11 +461,19 @@ LibraryObjectRule()
# if HugeLibrary && defined(SharedLibraryTarget3)
SharedLibraryTarget3($(LIBNAME),$(SoRev),$(OBJS1),$(OBJS2),$(OBJS3) $(EXTRASHAREDOBJS),.,.)
# else
# if defined(SharedLibtoolRev) && defined(SharedLibtoolLibraryTarget)
SharedLibtoolLibraryTarget($(LIBNAME),SharedLibtoolRev,$(OBJS) $(EXTRASHAREDOBJS),.,.)
# else
SharedLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRASHAREDOBJS),.,.)
# endif
# endif
# if !defined(LibInstall) || LibInstall
# if defined(SharedLibtoolRev) && defined(InstallSharedLibtoolLibrary)
InstallSharedLibtoolLibrary($(LIBNAME),SharedLibtoolRev,$(SHLIBDIR))
# else
InstallSharedLibrary($(LIBNAME),$(SoRev),$(SHLIBDIR))
# endif
# endif
# if HasSharedData
SharedLibraryDataTarget($(LIBNAME),$(SoRev),$(UNSHAREDOBJS))
# if !defined(LibInstall) || LibInstall
......
......@@ -2,7 +2,7 @@ XCOMM platform: $Xorg: NetBSD.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.108 2002/12/14 22:36:03 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.113 2003/07/11 22:17:40 tsi Exp $
#ifndef OSName
......@@ -90,21 +90,32 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasVarRun YES
#define HasVarDb YES
#define HasShadowPasswd NO
#define InstallXloadSetGID NO
/* Defines for using the GNU pth thread library -- experimental */
/*
* NetBSD 1.6M and newer supports POSIX Threads.
*/
#ifndef NetBSDThreads
# define NetBSDThreads YES
#endif
#if NetBSDThreads && \
((OSMajorVersion > 1) || \
(OSMajorVersion == 1 && OSMinorVersion > 6) || \
(OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 13))
#ifdef NetBSDPth
#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */
#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */
#define HasThreadSafeAPI NO
#define HasPosixThreads YES
#define SystemMTDefines -D_REENTRANT PthreadHLocation
#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread
#define SharedX11Reqs ThreadsLibraries
# define HasPosixThreads YES
# define ThreadedX YES
# define HasThreadSafeAPI YES
# define ThreadsLibraries -lpthread
# define LibraryMTDefines -DUSE_NBSD_THREADLIB
# define SystemMTDefines -D_REENTRANT
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
#else
#define HasPosixThreads NO
#define ThreadedX NO
# define ThreadedX NO
#endif
/*
......@@ -598,8 +609,8 @@ InstallManPageAliasesBase(file,destdir,aliases)
#define PositionIndependentCFlags
#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ |
sed 's/\.[0-9]*$$//'`
#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB)
#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
#define SharedXtReqs $(XONLYLIB) $(SMLIB) $(ICELIB)
#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XLIB)
#endif
/*
......@@ -6