All,
Below is a small patch to fix X11.tmp so that Fontconfig works correctly
if an OS file defines HasFontconfig, as well as a patch to sco5.cf to
use it. Also a few minor doc cleanups for sco5.
--- xc/config/cf/sco5.cf.jkj 2003-02-16 15:32:13.000000000 -0800
+++ xc/config/cf/sco5.cf 2003-02-16 15:35:19.000000000 -0800
@@ -2,9 +2,9 @@
/*
* This is for SCO Open Server 5.0.6A or later. You must have the
- * Linkers and Libraries update (OSS646) installed on 5.0.6 (it
+ * Execution Environment update (OSS646) installed on 5.0.6 (it
* ships standard in 5.0.7 and later), as well as the Graphics,
- * Web and X11 (gwxlibs) package installed, which also ships
+ * Web and X11 (gwxlibs) package OSS631 installed, which also ships
* standard with 5.0.7 and later.
*
* It is suggested that you use the GNU Development Tools for compiling
@@ -128,6 +128,7 @@
#define HasShm YES
#define HasStrcasecmp YES
#define HasZlib YES
+#define HasFontconfig YES
#define SharedLibXmu YES
#define SystemV YES
--- xc/config/cf/X11.tmpl.jkj 2003-02-17 09:36:47.000000000 -0800
+++ xc/config/cf/X11.tmpl 2003-02-17 09:41:56.000000000 -0800
@@ -3217,13 +3217,6 @@
ProjectUnsharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),XBuildLibDir)
#endif
-#ifndef FontconfigClientDepLibs
-#define FontconfigClientDepLibs $(DEPFONTCONFIGLIB) $(DEPFREETYPE2LIB)
ExpatClientDepLibs
-#endif
-#ifndef FontconfigClientLibs
-#define FontconfigClientLibs $(FONTCONFIGLIB) $(FREETYPE2LIB) ExpatClientLibs
-#endif
-
#ifdef UseInstalled
FONTCONFIGINCDIR=$(INCDIR)
#else
@@ -3304,6 +3297,13 @@
FONTCONFIGDEFINES = -DFONTCONFIG
#endif
+#ifndef FontconfigClientDepLibs
+#define FontconfigClientDepLibs $(DEPFONTCONFIGLIB) $(DEPFREETYPE2LIB)
+ExpatClientDepLibs
+#endif
+#ifndef FontconfigClientLibs
+#define FontconfigClientLibs $(FONTCONFIGLIB) $(FREETYPE2LIB) ExpatClientLibs
+#endif
+
#endif /* UseFontconfig */
#ifdef HasLibpng
--- xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml.jkj 2003-02-14
15:38:03.000000000 -0800
+++ xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml 2003-02-14 15:43:18.000000000
+-0800
@@ -5,7 +5,7 @@
<title>Information for SCO OpenServer Users
<author>J. Kean Johnston ([EMAIL PROTECTED])
-<date>9 November 2002
+<date>14 February 2003
<ident>
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.21 2002/11/20 23:00:42
dawes Exp $
@@ -21,17 +21,17 @@
Before you can either compile or execute a binary distribution of
XFree86, the following conditions must be met:
<itemize>
- <item>Ensure that you are running Release 5.0.6 or later. This is required
+ <item>Ensure that you are running Release 5.0.4 or later. This is required
because OSS646 is only supported on those platforms. There are no plans
to support XFree86 on earlier releases of OpenServer.
- <item>Ensure that OSS646, the ``Linkers and Libraries Update'' package is
+ <item>Ensure that OSS646, the ``Execution Environment Update'' package is
installed, if appropriate. Check the release notes for that update
to see whether or not your current operating system requires this
- update. This supplement will be available to the public in March
+ update. This supplement will be available to the public in February
2003.
<item>Ensure that OSS631, the "Graphics, Web and X11 Libraries" package
is installed. This ships standard with release 5.0.7 and later, and
- is only required for 5.0.6 users. This package will be updated fairly
+ is only required for 5.0.[456] users. This package will be updated fairly
frequently, and it us always suggested you have the latest possible
version installed. At some point in the future it may even update the
libraries in 5.0.7, so it is worth checking the release notes for this
@@ -105,7 +105,7 @@
in the R5 distribution.<p>
To use a Bus/Keyboard or PS2 mouse you should configure the mouse drivers
-under SCO as above using '<tt>mkdev mouse</tt>'. You may then use the
+using '<tt>mkdev mouse</tt>'. You may then use the
<tt>OsMouse</tt> option in your <tt>XF86Config</tt> to specify that XFree86
should use the SCO mouse drivers. To do this, set the <tt>Protocol</tt> to
"<tt>OsMouse</tt>" in the <tt>Pointer</tt> section of your
_______________________________________________
Devel mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/devel
