Commit 98a17368 authored by dawes's avatar dawes
Browse files

Import -f XFree86 4.0.99.2

parent 7bf7bda7
......@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $
XCOMM $XFree86: xc/Imakefile,v 3.24 2001/02/07 18:53:11 dawes Exp $
XCOMM $XFree86: xc/Imakefile,v 3.25 2001/03/21 17:36:43 dawes Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
......@@ -18,7 +18,9 @@ RELEASE = XOrgReleaseString
FONTSDIR = fonts
#endif
#ifndef Win32Architecture
#if BuildDocs
DOCSDIR = doc
#endif
NLSSUBDIR = nls
#endif
#endif
......
......@@ -2,7 +2,7 @@
# $XFree86: xc/Makefile,v 3.20 2001/01/24 17:28:53 tsi Exp $
# $XFree86: xc/Makefile,v 3.21 2001/03/03 22:03:43 tsi Exp $
# Luna users will need to either run make as "make MAKE=make"
# or add "MAKE = make" to this file.
......@@ -184,7 +184,7 @@ dangerous_strip_clean:
$(MAKE_CMD) $@
distclean:
$(MAKE_CMD) $@
$(RM) xmakefile
$(RM) xmakefile $(IRULESRC)/version.def
depend:
$(MAKE_CMD) $@
Everything:
......
......@@ -17,7 +17,7 @@ significant redesign of the XFree86 X server. Not all of the hardware
drivers from 3.3.x have been ported to 4.x yet, but conversely, 4.x has some
hardware support not present in 3.3.x. Our Driver Status document summarizes
how the hardware driver support compares between 3.3.6 and 4.0.2. Please
check there first before downloading 4.0.2.
check there first before downloading 4.0.2.
The 4.0.1 release introduced a new graphical configuration tool, "xf86cfg",
and a text mode interface was added to it for the 4.0.2 release. It is work
......@@ -824,34 +824,35 @@ via DDC, you may want to add that information to XF86Config.
To allow a graceful transition for applications moving from core text render-
ing to the Render extension, Xft can use either core fonts or FreeType and
the Render extension for text. By default, Xft is configured to support only
core fonts, see the section on building FreeType support for the changes
needed to add FreeType/Render fonts.
the Render extension for text. By default, Xft is configured to support both
core fonts and FreeType fonts using the supplied version of FreeType 2. See
the section on FreeType support in Xft for instructions on configuring
XFree86 to use an existing FreeType installation.
The Xft library uses a configuration file, XftConfig, which contains informa-
tion about which directories contain font files and also provides a sophisti-
cated font aliasing mechanism. Documentation for that file is included in
the Xft man page.
4.11.2 Building FreeType support for Xft
4.11.2 FreeType support in Xft
XFree86 4.0.2 includes sources for FreeType version 2.0.1, but they are not
built and installed automatically. As a result, Xft is configured to provide
only core fonts by default.
XFree86 4.0.2 includes sources for FreeType version 2.0.1, and, by default,
they are built and installed automatically.
To build FreeType support for Xft, first FreeType must be built and
installed, either from the sources included in XFree86 in extras/freetype2 or
from another FreeType (version 2.0.1 or later) release. Early FreeType ver-
sion 2 releases used a different header file installation and aren't compati-
ble with XFree86. Instructions for building and installing FreeType can be
found in the INSTALL file included with the FreeType release.
If you prefer, you can configure XFree86 4.0.2 to use an existing Freetype2
installation by telling XFree86 not to build the internal copy and indicating
where that external version has been installed. Edit (or create) con-
fig/cf/host.def to include:
Second, XFree86 needs to know the installed location for FreeType, usually
/usr/local. Edit (or create) config/cf/host.def to include:
o #define BuildFreetype2Library NO
#define Freetype2Dir /usr/local
o #define Freetype2Dir /usr/local
Finally, build XFree86 with "make World" from the top.
Note that XFree86 assumes you'll be using a release FreeType no older than
version 2.0.1. Early FreeType version 2 releases used a different header
file installation and aren't compatible with XFree86. Instructions for build-
ing and installing FreeType can be found in the INSTALL file included with
the FreeType release.
4.11.3 Application Support For Anti-Aliased Text
......@@ -871,8 +872,8 @@ instead:
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
through the Render extension, a path which has not been optimized within the
X server yet.
through the Render extension, a path which is currently somewhat slower than
core text.
4.12 Other extensions
......@@ -1081,7 +1082,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.58 2000/12/17 23:01:10 dawes Exp $
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.60 2001/03/02 17:40:48 dawes Exp $
$XFree86: xc/RELNOTES,v 1.1 2000/12/18 02:45:46 dawes Exp $
$XFree86: xc/RELNOTES,v 1.2 2001/03/02 17:48:40 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.104 2001/01/17 16:22:29 dawes Exp $
XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.106 2001/03/02 23:01:27 dawes Exp $
#ifndef UseElfFormat
#define UseElfFormat DefaultToElfFormat
......@@ -66,6 +66,38 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define InstallXloadSetGID YES
#endif
/*
* Multi-thread safe libs
*/
/* 2.2.7 and later has libc_r (POSIX threads) */
#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
OSMajorVersion >= 3
# ifndef HasLibPthread
# define HasLibPthread NO
# 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.
*/
# define HasThreadSafeAPI YES
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
# if HasLibPthread
# define ThreadsLibraries -lpthread
# else
# define BuildThreadStubLibrary YES
# define NeedUIThrStubs YES
# define ThreadsCompileFlags -pthread
# define ThreadsLibraries -pthread
# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
# endif
#endif
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
......@@ -88,7 +120,32 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasFlex YES
#endif
#define CcCmd cc
#ifndef HasMktemp
#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
(OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7)
#define HasMktemp YES
#else
#define HasMktemp NO
#endif
#endif
/*
* Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP),
* when building X to avoid that for each client ld give the message
*
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
#if BuildThreadStubLibrary && !UseInstalled
# define CcCmd $(CLIENTENVSETUP) cc
# define CplusplusCmd $(CLIENTENVSETUP) c++
#else
# define CcCmd cc
# define CplusplusCmd c++
#endif
#define CppCmd /usr/bin/cpp
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
#define CppCmd /usr/bin/cpp
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
......@@ -218,8 +275,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
/* PAM appeared in FreeBSD 3.1 */
#if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 )
#ifndef HasPam
#define HasPam YES
#endif
#endif
/*
* For FreeBSD 2.2.5 and later don't make any assumptions about the version
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.92 2001/02/07 23:28:44 dawes Exp $
XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.93 2001/03/31 01:57:20 keithp Exp $
/*
* MACHINE-INDEPENDENT RULES; DO NOT MODIFY
......@@ -2273,7 +2273,7 @@ clean:: @@\
#ifndef SwitchYYPrefix
#define SwitchYYPrefix(in,out,prefix) \
sed 's/yy/prefix/g' in > out && RemoveFile(in)
sed 's/yy/prefix/g' in | sed 's/__REALLY_YY__/yy/' > out && RemoveFile(in)
#endif
#ifndef LexFilePrefix
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.95 2001/02/13 17:20:09 tsi Exp $
XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.97 2001/03/18 14:50:30 dawes Exp $
XCOMM ----------------------------------------------------------------------
/*
......@@ -408,6 +408,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#define HasCplusplus NO
#endif
#endif
#ifndef HasMktemp
#define HasMktemp NO /* if you have the mktemp command */
#endif
#ifndef HasNdbm
#define HasNdbm NO
#endif
......@@ -445,6 +448,10 @@ 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 the system has the Freetype2 library */
#ifndef HasFreetype2
#define HasFreetype2 NO
#endif
#if HasKrbIV
#ifndef KrbIVIncludes
#define KrbIVIncludes /**/
......
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.49 2001/02/03 19:33:04 herrb Exp $
XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.52 2001/03/03 09:52:59 herrb Exp $
XCOMM
#ifndef OSName
......@@ -78,6 +78,14 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasLibPthread NO
#endif
#ifndef HasMktemp
# if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 1)
# define HasMktemp YES
# else
# define HasMktemp NO
# endif
#endif
/*
* Multi-thread safe libs
*/
......@@ -95,9 +103,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif
#endif
#if OSMajorVersion == 2 && OSMinorVersion > 6 || OSMajorVersion >= 3
# define HasThreadSafeAPI YES
#endif
/* Set this to YES when getpwuid_r is added to libc_r */
# define HasThreadSafeAPI NO
/*
* Compiler Features
......@@ -151,7 +158,11 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define LdPostLib /**/
# define ServerExtraDefines GccGasOption XFree86ServerDefines
# ifndef XFree86ConsoleDefines
# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DWSCONS_SUPPORT -DPCVT_SUPPORT
# if OSMajorVersion == 2 && OSMinorVersion <= 8
# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
# else
# define XFree86ConsoleDefines -DWSCONS_SUPPORT
# endif
# endif
#endif
......
......@@ -5,7 +5,7 @@ XCOMM
XCOMM
XCOMM
XCOMM
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.99 2001/02/09 00:35:02 keithp Exp $
XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.111 2001/04/05 02:43:33 dawes Exp $
/***************************************************************************
* *
......@@ -23,10 +23,12 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.99 2001/02/09 00:35:02 keithp Exp $
* InstallAppDefaults (class)
* InstallAppDefaultsLong (file,class)
* MakeFontsDir (deplist)
* MakeXftCache (deplist)
* MakeFonts ()
* InstallFontObjs (objs,dest)
* InstallFonts (dest)
* InstallFontAliases (dest)
* InstallXftCache (dest)
* FontSrc (basename)
* FontBaseObj (basename)
* InstallFontScale (dest)
......@@ -79,6 +81,15 @@ VENDORMANVERSION = XVendorManVersionString
#ifndef BuildServersOnly
#define BuildServersOnly NO
#endif
#ifndef BuildClients
#define BuildClients !BuildServersOnly
#endif
#ifndef BuildDocs
#define BuildDocs !BuildServersOnly
#endif
#ifndef BuildLibraries
#define BuildLibraries (!BuildServersOnly || BuildClients)
#endif
#ifndef BuildFontServer
#define BuildFontServer YES
#endif
......@@ -121,14 +132,93 @@ VENDORMANVERSION = XVendorManVersionString
#ifndef BuildCIDFonts
#define BuildCIDFonts YES
#endif
/* Not used now */
#ifndef BuildLatin2Fonts
#define BuildLatin2Fonts NO
#define BuildLatin2Fonts YES
#endif
#ifndef BuildCyrillicFonts
#define BuildCyrillicFonts NO
#define BuildCyrillicFonts YES
#endif
#ifndef UseKoi8RForCyrillic
#define UseKoi8RForCyrillic NO
#define UseKoi8RForCyrillic YES
#endif
/* Some bdf font generation details. The scripts for this require perl. */
#ifndef TruncateUCSFonts
#define TruncateUCSFonts HasPerl
#endif
#ifndef MaxUCSChar
#define MaxUCSChar 0x3200
#endif
#ifndef DerivedUCSFonts
#define DerivedUCSFonts HasPerl
#endif
/* These primarily control generation of derived 8-bit fonts. */
#ifndef BuildUCSFonts
#define BuildUCSFonts YES
#endif
/* Setting BuildISO8859_1Fonts to NO may result in problems. */
#ifndef BuildISO8859_1Fonts
#define BuildISO8859_1Fonts YES
#endif
#ifndef BuildISO8859_2Fonts
#define BuildISO8859_2Fonts YES
#endif
#ifndef BuildISO8859_3Fonts
#define BuildISO8859_3Fonts YES
#endif
#ifndef BuildISO8859_4Fonts
#define BuildISO8859_4Fonts YES
#endif
#ifndef BuildISO8859_5Fonts
#define BuildISO8859_5Fonts BuildCyrillicFonts
#endif
#ifndef BuildArabicFonts
#define BuildArabicFonts YES
#endif
#ifndef BuildISO8859_6Fonts
#define BuildISO8859_6Fonts BuildArabicFonts
#endif
#ifndef BuildGreekFonts
#define BuildGreekFonts YES
#endif
#ifndef BuildISO8859_7Fonts
#define BuildISO8859_7Fonts BuildGreekFonts
#endif
#ifndef BuildHebrewFonts
#define BuildHebrewFonts YES
#endif
#ifndef BuildISO8859_8Fonts
#define BuildISO8859_8Fonts BuildHebrewFonts
#endif
#ifndef BuildISO8859_9Fonts
#define BuildISO8859_9Fonts YES
#endif
#ifndef BuildISO8859_10Fonts
#define BuildISO8859_10Fonts YES
#endif
#ifndef BuildISO8859_13Fonts
#define BuildISO8859_13Fonts YES
#endif
#ifndef BuildISO8859_14Fonts
#define BuildISO8859_14Fonts YES
#endif
#ifndef BuildISO8859_15Fonts
#define BuildISO8859_15Fonts YES
#endif
#ifndef BuildKOI8_RFonts
#define BuildKOI8_RFonts BuildCyrillicFonts
#endif
#ifndef BuildJapaneseFonts
#define BuildJapaneseFonts YES
#endif
#ifndef BuildJISX0201Fonts
#define BuildJISX0201Fonts BuildJapaneseFonts
#endif
#ifndef BuildKoreanFonts
#define BuildKoreanFonts YES
#endif
#ifndef BuildChineseFonts
#define BuildChineseFonts YES
#endif
#ifndef HasXAudio
#define HasXAudio NO
......@@ -166,9 +256,15 @@ VENDORMANVERSION = XVendorManVersionString
#ifndef BuildPexExt
#define BuildPexExt NO
#endif
#ifndef BuildPexLib
#define BuildPexLib (BuildPex && !BuildServersOnly)
#endif
#ifndef BuildXInputExt
#define BuildXInputExt NO
#endif
#ifndef BuildXInputLib
#define BuildXInputLib (BuildXInputExt && !BuildServersOnly)
#endif
#ifndef BuildEVI
#define BuildEVI YES
#endif
......@@ -188,7 +284,7 @@ VENDORMANVERSION = XVendorManVersionString
#define BuildFontCache YES
#endif
#ifndef BuildFontCacheLib
#define BuildFontCacheLib BuildFontCache
#define BuildFontCacheLib (BuildFontCache && !BuildServersOnly)
#endif
#ifndef BuildLowMem
#define BuildLowMem NO
......@@ -208,16 +304,16 @@ VENDORMANVERSION = XVendorManVersionString
#endif
#endif
#ifndef BuildXIElib
#define BuildXIElib BuildXIE
#define BuildXIElib (BuildXIE && !BuildServersOnly)
#endif
#ifndef BuildXKB
#define BuildXKB YES
#endif
#ifndef BuildXKBlib
#define BuildXKBlib BuildXKB
#define BuildXKBlib (BuildXKB && !BuildServersOnly)
#endif
#ifndef BuildXKBuilib
#define BuildXKBuilib BuildXKB
#define BuildXKBuilib (BuildXKB && !BuildServersOnly)
#endif
/*
* WARNING: Setting UseXKBInClients to YES cause incompatibilities
......@@ -240,7 +336,7 @@ VENDORMANVERSION = XVendorManVersionString
#define BuildXinerama NO
#endif
#ifndef BuildXineramaLibrary
#define BuildXineramaLibrary BuildXinerama
#define BuildXineramaLibrary (BuildXinerama && !BuildServersOnly)
#endif
#ifndef BuildXCSecurity
#define BuildXCSecurity YES
......@@ -274,23 +370,26 @@ VENDORMANVERSION = XVendorManVersionString
#define BuildXprint NO
#endif
#endif
#ifndef BuildXprintLib
#define BuildXprintLib (BuildXprint && !BuildServersOnly)
#endif
#ifndef BuildScreenSaverExt
#define BuildScreenSaverExt NO
#endif
#ifndef BuildScreenSaverLibrary
#define BuildScreenSaverLibrary BuildScreenSaverExt
#define BuildScreenSaverLibrary (BuildScreenSaverExt && !BuildServersOnly)
#endif
#ifndef BuildXF86VidModeExt
#define BuildXF86VidModeExt NO
#endif
#ifndef BuildXF86VidModeLibrary
#define BuildXF86VidModeLibrary BuildXF86VidModeExt
#define BuildXF86VidModeLibrary (BuildXF86VidModeExt && !BuildServersOnly)
#endif
#ifndef BuildXF86MiscExt
#define BuildXF86MiscExt NO
#endif
#ifndef BuildXF86MiscLibrary
#define BuildXF86MiscLibrary BuildXF86MiscExt
#define BuildXF86MiscLibrary (BuildXF86MiscExt && !BuildServersOnly)
#endif
#ifndef BuildXF86BigfontExt
#define BuildXF86BigfontExt NO
......@@ -299,31 +398,31 @@ VENDORMANVERSION = XVendorManVersionString
#define BuildXF86DGA NO
#endif
#ifndef BuildXF86DGALibrary
#define BuildXF86DGALibrary BuildXF86DGA
#define BuildXF86DGALibrary (BuildXF86DGA && !BuildServersOnly)
#endif
#ifndef BuildXvExt
#define BuildXvExt NO
#endif
#ifndef BuildXvLibrary
#define BuildXvLibrary BuildXvExt
#endif
#ifndef BuildGLULibrary
#define BuildGLULibrary NO
#define BuildXvLibrary (BuildXvExt && !BuildServersOnly)
#endif
#ifndef BuildGlxExt
#define BuildGlxExt NO
#endif
#ifndef BuildGLXLibrary
#define BuildGLXLibrary BuildGlxExt
#define BuildGLXLibrary (BuildGlxExt && !BuildServersOnly)
#endif
#ifndef BuildGLULibrary
#define BuildGLULibrary (BuildGLXLibrary && HasCplusplus)
#endif
#ifndef BuildXF86RushExt
#define BuildXF86RushExt NO
#endif
#ifndef BuildXF86RushLibrary
#define BuildXF86RushLibrary BuildXF86RushExt
#define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly)
#endif
#ifndef BuildDPSLibraries
#define BuildDPSLibraries YES
#define BuildDPSLibraries !BuildServersOnly
#endif
#ifndef BuildDPSLibrary
#define BuildDPSLibrary BuildDPSLibraries
......@@ -334,17 +433,23 @@ VENDORMANVERSION = XVendorManVersionString
#ifndef BuildPSResLibrary
#define BuildPSResLibrary BuildDPSLibraries
#endif
#ifndef BuildDPSClients
#define BuildDPSClients BuildDPSLibraries
#endif
#ifndef BuildRender
#define BuildRender NO
#endif
#ifndef BuildRenderLibrary
#define BuildRenderLibrary YES
#define BuildRenderLibrary !BuildServersOnly
#endif
#ifndef BuildXftLibrary
#define BuildXftLibrary BuildRenderLibrary
#endif
#ifndef UseFreetype2
#define UseFreetype2 BuildXftLibrary
#endif
#ifndef BuildFreetype2Library
#define BuildFreetype2Library BuildXftLibrary
#define BuildFreetype2Library (UseFreetype2 && !HasFreetype2)
#endif
#ifndef BuildMiscDocs
......@@ -416,6 +521,9 @@ VENDORMANVERSION = XVendorManVersionString
#ifndef ThreadedProject
#define ThreadedProject ThreadedX
#endif
#ifndef BuildThreadStubLibrary
#define BuildThreadStubLibrary NO
#endif
#ifndef HasWChar32
#define HasWChar32 SystemV4
#endif
......@@ -1248,7 +1356,12 @@ XCOMM X Window System make variables; these need to be coordinated with rules
RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir
XFTCACHE = $(CLIENTENVSETUP) $(XBUILDBINDIR)/xftcache
#if HasPerl
MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
#else
MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh
#endif
UCS2ANY = $(FONTSRC)/util/ucs2any.pl
BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl
UCSMAPPREFIX = $(FONTSRC)/util/map-
......@@ -1561,6 +1674,12 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
#ifndef ProfileLibGlx
#define ProfileLibGlx NO
#endif
#ifndef BuildLibGlxWithoutPIC
#define BuildLibGlxWithoutPIC NO
#endif
#if BuildLibGlxWithoutPIC && SharedLibGlx
#define SharedLibGlxWithoutPIC YES
#endif
#ifndef LinkGLToUsrLib
#define LinkGLToUsrLib NO
#endif
......@@ -1756,7 +1875,7 @@ ProjectUnsharedLibReferences(PSRES,psres,$(PSRESLIBSRC),XBuildLibDir)
#endif
#if BuildGLULibrary
GLULIBSRC = $(LIBSRC)/GL/glu
GLULIBSRC = $(LIBSRC)/GLU
#if SharedLibGlu
#ifndef SharedGluRev
#define SharedGluRev 1.3
......@@ -1890,6 +2009,28 @@ SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev)
ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir)
#endif
#ifndef SharedLibXmuu
#define SharedLibXmuu HasSharedLibraries
#endif
#ifndef NormalLibXmuu
#define NormalLibXmuu (!SharedLibXmuu | ForceNormalLib)
#endif
#ifndef DebugLibXmuu
#define DebugLibXmuu NO /* debugged Xmuu library */
#endif
#ifndef ProfileLibXmuu
#define ProfileLibXmuu NO /* profiled Xmuu library */
#endif
XMUUSRC = $(LIBSRC)/Xmuu
#if SharedLibXmuu
#ifndef SharedXmuuRev
#define SharedXmuuRev 1.0
#endif
SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev)
#else
ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir)
#endif
#ifndef SharedOldX
#define SharedOldX HasSharedLibraries
#endif
......@@ -2299,15 +2440,18 @@ SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedF
ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir)
#endif
#if UseFreetype2
#if BuildFreetype2Library
FREETYPE2INCLUDES=$(TOP_X_INCLUDES)/freetype2
FREETYPE2DEFINES=-DFREETYPE2
#define HasFreetype2 YES
#else
#ifdef Freetype2Dir
#if HasFreetype2