[xorg-commit-diffs] xc/config/cf site.def, 1.1.4.1.6.1.6.2, 1.1.4.1.6.1.6.3 xprint_site.def, 1.1.2.5, 1.1.2.6

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv6612/config/cf

Modified Files:
      Tag: XPRINT
	site.def xprint_site.def 
Log Message:
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=487 - Build system needs adjustments for Solaris

Index: site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/site.def,v
retrieving revision 1.1.4.1.6.1.6.2
retrieving revision 1.1.4.1.6.1.6.3
diff -u -d -r1.1.4.1.6.1.6.2 -r1.1.4.1.6.1.6.3
--- a/site.def	13 Apr 2004 03:16:30 -0000	1.1.4.1.6.1.6.2
+++ b/site.def	16 Apr 2004 22:16:01 -0000	1.1.4.1.6.1.6.3
@@ -33,6 +33,7 @@
 
 
 #ifdef BeforeVendorCF
+XCOMM site.def/beforevendorcf start
 
 /*
  * Include this for easy XFree86 customisations
@@ -43,8 +44,6 @@
 
 #include <host.def>
 
-#include <xprint_site.def>
-
 /* On systems where cpp doesn't correctly expand macros in include directives
  * the two following macros need to be defined directly (where "X11" is
  * really whatever the TopLevelProject macro is defined to be).
@@ -67,9 +66,13 @@
 #endif
 */
 
+XCOMM site.def/beforevendorcf end
 #endif /* BeforeVendorCF */
 
+#include <xprint_site.def>
+
 #ifdef AfterVendorCF
+XCOMM site.def/aftervendorcf start
 
 #ifndef ProjectRoot
 #define ProjectRoot /usr/X11R6
@@ -145,4 +148,5 @@
 
 #include <host.def>
 
+XCOMM site.def/aftervendorcf end
 #endif /* AfterVendorCF */

Index: xprint_site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Attic/xprint_site.def,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- a/xprint_site.def	15 Apr 2004 00:11:03 -0000	1.1.2.5
+++ b/xprint_site.def	16 Apr 2004 22:16:01 -0000	1.1.2.6
@@ -81,7 +81,16 @@
 #define XpPostScriptDDX	               YES
 #define XpPdfDDX	               NO
 #define XpSvgDDX	               NO
-#define BuildFonts	               NO
+
+/* Needed to build encoding files */
+#define BuildFonts	               YES
+#define BuildSpeedoFonts               NO
+#define BuildType1Fonts                NO
+#define BuildCIDFonts                  NO
+#define BuildTrueTypeFonts             NO
+#define BuildEthiopicFonts             NO
+#define BuildBethMarduthoFonts         NO
+
 #define GzipFontCompression            YES
 #define BuildFreeType	               YES
 /* Xprt does not have special support for GLX and XIE (yet) */
@@ -151,6 +160,10 @@
 #undef XsunServer
 #define XsunServer    NO
 
+XCOMM X11R6.7's sun.cf does not set ProjectRoot to /usr/openwin anymore - why ?
+#define ProjectRoot      /usr/openwin
+#define ServerConfigDir  /usr/openwin/server/etc
+
 XCOMM Some build hacks for the GISWxprintglue package
 #if BuildGISWxprintglue
 #  define ProjectRoot      /usr/openwin