Merge branch '3.6.x'

1 files changed, 0 insertions, 158 deletions

diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index c4c5f59ab..aca6b3933 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -1,10 +1,3 @@
-$Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $
-
-
-
-
-$XFree86: xc/config/cf/README,v 1.20 2003/04/14 20:35:50 herrb Exp $
-
 The easiest way to write an Imakefile is to find another one that does
 something similar and copy/modify it!
 
@@ -60,7 +53,6 @@ Imake.tmpl provides defaults for the following variables:
 	HasCodeCenter		boolean for system has CodeCenter
 	HasCookieMaker		boolean for system has xauth cookie generator
 	HasCplusplus		system has a C++ compiler?
-	HasDECnet		system has DECnet?
 	HasFortran		boolean for system has Fortran compiler
 	HasGcc			boolean for system has GNU gcc compiler
 	HasGcc2			boolean for system has GNU gcc 2.x compiler
@@ -68,14 +60,11 @@ Imake.tmpl provides defaults for the following variables:
 	HasGnuMake		use the GNU make program?
         HasGhostPCL             boolean for system has GhostPCL
         HasGhostScript          boolean for system has GhostScript
-	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
 	HasLibCrypt		boolean for system has libcrypt
         HasMotif                boolean for system has Motif
         HasMotif2               boolean for system has Motif2 or OpenMotif
-	HasNdbm			boolean for system has ndbm routines
 	HasPoll			use poll() syscall?
 	HasPurify		boolean for system has Purify
 	HasPutenv		boolean for libc has putenv()
@@ -87,13 +76,11 @@ Imake.tmpl provides defaults for the following variables:
 	HasShm			boolean for System V shared memory
 	HasSockets		boolean for system has BSD sockets
 	HasStrcasecmp		boolean for system implements str[n]casecmp
-	HasStreams		use STREAMS I/O interface?
 	HasSymLinks		boolean for system has symbolic links
 	HasTestCenter		boolean for system has TestCenter
 	HasVarDirectory		boolean for system has /var
 	HasVFork		boolean for system has vfork()
 	HasVoidSignalReturn	boolean for POSIX signal() procs
-	HasZlib			boolean for system has libz
 	IncludeSharedObjectInNormalLib define for static libs to include
 				       -fPIC objects on relevant archs
 	IncRoot			parent of X11 include directory
@@ -106,10 +93,6 @@ 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
 	LdCombineFlags		flags for incremental loading
 	LexCmd			command to run lex
@@ -130,7 +113,6 @@ Imake.tmpl provides defaults for the following variables:
 	MkCookieCmd		command to generate an xauth cookie
 	MsMacros		macro flag for TroffCmd, normally "-ms"
 	MvCmd			command to rename a file
-	NdbmDefines		-D's to turn on use of ndbm routines
 	NeedConstPrototoypes	whether const is supported
 	NeedFunctionPrototypes	whether or not to force function prototypes
 	NeedNestedPrototypes	whether nested prototypes are supported
@@ -173,51 +155,25 @@ X11.tmpl provides defaults for the following variables:
 	BDFTOSNFFILT		command to run bdftosnf
 	BaseExtensionDefines	universal extensions to use
 	BinDir			directory in which to install programs
-	BuildAppgroup		build AppGroup extension in server
-	BuildCup		build Colormap Utilization extension in server
 	BuildDBE		build DOUBLE-BUFFER extension
-	BuildDmx		build Distributed Multihead X server and extension
 	BuildDPMS		build Display Power Management Signaling extension
-	BuildFontServer		build font server
-	BuildFonts		build pcf fonts
 	BuildIncRoot		relative path to location of headers in build
 	BuildIncTop		path from build includes directory to top
-	BuildEVI		build EVI server extension
-	BuildLBX		build LBX (aka X.fast) server extension
-	BuildMultibuffer	build Multibuffer extension (obsolete)
 	BuildPlugin		build xrx plug-in for web browsers
 	BuildRECORD		Build RECORD extension
 	BuildServer		build X server
-	BuildXAudio		build Audio 
-	BuildXAServer		build Audio server
 	BuildXCSecurity		Build Security Extension
 	BuildXInputExt		build X Input extension (requires ddx support,
 					which exists only in Xhp and XFree86)
-	BuildXInputLib		build X Input library
 	BuildXKB		build X Keyboard Extension?
 	BuildXKBlib		build X Keyboard Extension into Xlib?
 	UseXKBInClients		Use XKB functions in normal clients?
 	ConfigDir		install directory for config files
 	ConnectionFlags		-D's for supported transports
 	ContribDir		location of user-contributed sources
-	DebugLibFS		build libFS_d.a
-	DebugLibICE		build libICE_d.a
-	DebugLibSM		build libSM_d.a
 	DebugLibX11		build libX11_d.a
-	DebugLibXau		build libXau_d.a
-	DebugLibXaw		build libXaw_d.a
-	DebugLibXdmcp		build libXdmcp_d.a
-	DebugLibXext		build libXext_d.a
-	DebugLibXi		build libXi_d.a
-	DebugLibXmu		build libXmu_d.a
-	DebugLibXt		build libXt_d.a
-	DebugLibXtst		build libXtst_d.a
-	DebugLibXag		build libXag_d.a
-	DebugOldX		build liboldX_d.a
 	DefaultCursorTheme      name of default cursor theme
-	DefaultFSConfigFile	default font server config file
 	DefaultFontPath		default server font path
-	DefaultRGBDatabase	default server rgb color database
 	DefaultSystemPath	default system xdm PATH environment variable
 	DefaultSystemShell	default /bin/sh
 	DefaultUserPath		default user xdm PATH environment variable
@@ -227,22 +183,11 @@ X11.tmpl provides defaults for the following variables:
 	DriverManSuffix		man suffix for driver pages
 	ExtensionDefines	-D's for universal extensions
 	ExtensionOSDefines	-D's for additional extensions
-	FontCompilerFlags	flags for bdftosnf
-	FontDefines		-D's to turn on font options
-	FontDir			directory in which to install fonts
-	FontFilters		-D's to specify font conversion filters
-	FontOSDefines		-D's for which fonts to support
 	ForceNormalLib		force building of .a in addition to shared lib
-	GzipFontCompression	boolean for using gzip instead of compress
 	HasXdmAuth		boolean for using XDM-AUTHORIZATION-1;
 					needs Wraphelp.c, see Release Notes
-	InstallAppDefFiles	install new app defaults files over old?
-	InstallFSConfig		install fs config file over old?
 	InstallLibManPages	boolean for installing library man pages
 	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
@@ -256,36 +201,10 @@ X11.tmpl provides defaults for the following variables:
 	MiscManDir		directory in which to install misc man pages
 	NeedDefaultDepLibs	boolean for enabling default DEPLIBS
 	NlsDir			directory in which to install nls files
-	NormalLibFS		build libFS.a
-	NormalLibICE		build libICE.a
-	NormalLibSM		build libSM.a
 	NormalLibX11		build libX11.a
-	NormalLibXau		build libXau.a
-	NormalLibXaw		build libXaw.a
-	NormalLibXdmcp		build libXdmcp.a
-	NormalLibXext		build libXext.a
-	NormalLibXi		build libXi.a
-	NormalLibXmu		build libXmu.a
-	NormalLibXt		build libXt.a
-	NormalLibXtst		build libXtst.a
-	NormalLibXag		build libXag.a
-	NormalOldX		build liboldX.a
 	OsNameDefines		If uname(2) unavailable, set to -DOS_NAME=OSName
 	PrimaryScreenResolution	resolution of default server screen
-	ProfileLibFS		build libFS_p.a
-	ProfileLibICE		build libICE_p.a
-	ProfileLibSM		build libSM_p.a
 	ProfileLibX11		build libX11_p.a
-	ProfileLibXau		build libXau_p.a
-	ProfileLibXaw		build libXaw_p.a
-	ProfileLibXdmcp		build libXdmcp_p.a
-	ProfileLibXext		build libXext_p.a
-	ProfileLibXi		build libXi_p.a
-	ProfileLibXmu		build libXmu_p.a
-	ProfileLibXt		build libXt_p.a
-	ProfileLibXtst		build libXtst_p.a
-	ProfileLibXag		build libXag_p.a
-	ProfileOldX		build liboldX_p.a
 	ProjectX		version indicating this is the X Window System
 	RemoveTargetProgramByMoving	boolean for rm -f that doesn't
 	SHELLPATH		-D for /bin/sh
@@ -294,24 +213,10 @@ X11.tmpl provides defaults for the following variables:
 	ServerExtraDefines	special -D's for server
 	ServerOSDefines		OS -D's for server
 	ServerAssertDefines	-DNDEBUG for no assertions, /**/ for assertions
-	SharedLibFS		boolean for making sharable libFS.so
-	SharedLibICE		boolean for making sharable libICE.so
-	SharedLibSM		boolean for making sharable libSM.so
 	SharedLibX11		boolean for making sharable libX11.so
-	SharedLibXau		boolean for making sharable libXau.so
-	SharedLibXaw		boolean for making sharable libXaw.so
-	SharedLibXdmcp		boolean for making sharable libXdmcp.so
-	SharedLibXext		boolean for making sharable libXext.so
-	SharedLibXi		boolean for making sharable libXi.so
-	SharedLibXmu		boolean for making sharable libXmu.so
-	SharedLibXt		boolean for making sharable libXt.so
-	SharedLibXtst		boolean for making sharable libXtst.so
-	SharedLibXag		boolean for making sharable libXag.so
-	SharedOldX		boolean for making sharable liboldX.so
 	ShmDefines		MIT-SHM define
 	TwmDir			directory in which to install twm config files
 	UseCCMakeDepend		boolean for using alternate makedepend script
-	UseRgbTxt		use rgb.txt file as is instead of DBM-compiled
 	VarDirectory		directory in /var for logs, etc., and config
 	VendorHasX11R6_3libXext	don't need Security & AppGroup in xrx plug-in
 	XAppLoadDir		directory in which to install app defaults
@@ -319,20 +224,9 @@ X11.tmpl provides defaults for the following variables:
 	XFileSearchPathDefault	default path to search for app defaults files
 	XInputDefines		XINPUT define
 	XMalloc0ReturnsNullDefines -D's specifically for libX11
-	XawClientDepLibs	DEPLIBS for clients that use Xaw
-	XawClientLibs		LOCAL_LIBRARIES for clients that use Xaw
 	XdmConfigurationSubdirectory	name of default xdm configuration
 	XdmDir			directory in which to install xdm files
-	XdmServersType		type of xdm Xservers file to install
 	XinitDir		directory in which to install xinit files
-	XPrintDir		parent of X Print server config directory
-	XprtServer		build the X Print server
-	XpRasterDDX		include the raster print ddx driver
-	XpColorPclDDX		include the color PCL print ddx driver
-	XpMonoPclDDX		include the monochrome PCL print ddx driver
-	XpPostScriptDDX		include the PostScript print ddx driver
-	XpPdfDDX		include the PDF print ddx driver
-	XpSvgDDX		include the SVG print ddx driver
 	XmanLocalSearchPath	non-standard path for man pages
 	XtErrorPrefix		leading text in XtError() msg; eg. 'X Toolkit '
 	XtWarningPrefix		leading text in XtWarning()msg, same as above
@@ -387,56 +281,8 @@ An <os>Lib.rules file provides defaults for the following variables:
 
 An <os>Lib.tmpl file provides defaults for the following variables:
 
-	SharedFSReqs		required libs for libFS.so
-	SharedFSRev		version number for libFS.so
-	SharedICEReqs		required libs for libICE.so
-	SharedICERev		version number for libICE.so
-	SharedOldXReqs		required libs for liboldX.so
-	SharedOldXRev		version number for liboldX.so
-	SharedSMReqs		required libs for libSM.so
-	SharedSMRev		version number for libSM.so
 	SharedX11Reqs		required libs for libX11.so
 	SharedX11Rev		version number for libX11.so
-	SharedXauReqs		required libs for libXau.so
-	SharedXauRev		version number for libXau.so
-	SharedXawReqs		required libs for libXaw.so
-	SharedXawRev		version number for libXaw.so
-	SharedXdmcpReqs		required libs for libXdmcp.so
-	SharedXdmcpRev		version number for libXdmcp.so
-	SharedXextReqs		required libs for libXext.so
-	SharedXextRev		version number for libXext.so
-	SharedXiReqs		required libs for libXi.so
-	SharedXiRev		version number for libXi.so
-	SharedXmuReqs		required libs for libXmu.so
-	SharedXmuRev		version number for libXmu.so
-	SharedXtReqs		required libs for libXt.so
-	SharedXtRev		version number for libXt.so
-	SharedXtstReqs		required libs for libXtst.so
-	SharedXtstRev		version number for libXtst.so
-	SharedXmReqs		required libs for libXm.so
-	SharedXmRev		version number for libXm.so
-	SharedMrmReqs		required libs for libMrm.so
-	SharedMrmRev		version number for libMrm.so
-	SharedUilReqs		required libs for libUil.so
-	SharedUilRev		version number for libUil.so
-	SharedTtReqs		required libs for libtt.so
-	SharedTtRev		version number for libtt.so
-	SharedPamReqs		required libs for libpam.so
-	SharedPamRev		version number for libpam.so
-	SharedDtSvcReqs		required libs for libDtSvc.so
-	SharedDtSvcRev		version number for libDtSvc.so
-	SharedDtSearchReqs	required libs for libDtSearch.so
-	SharedDtSearchRev	version number for libDtSearch.so
-	SharedDtWidgetReqs	required libs for libDtWidget.so
-	SharedDtWidgetRev	version number for libDtWidget.so
-	SharedDtHelpReqs	required libs for libDtHelp.so
-	SharedDtHelpRev		version number for libDtHelp.so
-	SharedDtPrintReqs	required libs for libDtPrint.so
-	SharedDtPrintRev	version number for libDtPrint.so
-	SharedDtTermReqs	required libs for libDtTerm.so
-	SharedDtTermRev		version number for libDtTerm.so
-	SharedDtMrmReqs		required libs for libDtMrm.so
-	SharedDtMrmRev		version number for libDtMrm.so
 
 Vendor.cf files and/or site/host specific .def files may define the
 following variables:
@@ -457,17 +303,13 @@ The following variables are used by some part of the tree:
 	DvipsCmd		command to turn .dvi file into PostScript
 	MotifBC			using Motif 1.1.1, 1.1.2, or 1.1.3?
 	GetValuesBC		compat GetValues behavior for broken apps?
-	NeedBerklib		application needs libXbsd?
 	SvgaConfig		default SVGA configuration
 	HasGetReturnAddress	util/memleak
 	HasShadowPasswd		system has getspnam() function
-	XnestServer		build X server with Xlib-based ddx
-	XVirtualFramebufferServer	build X server with virtual memory framebuffer
 	WebServer		host:port of your Web server (see programs/xrx)
 	HtmlDir			path used by Web server for HTML and RX docs
 	CgiBinDir		path used by Web server for CGI programs
 	ProxyManager		ICE network ID to contact a running proxymngr
-	XdmxServer		build Distributed Multihead X server
 
 
 Make Variables