[xorg-commit-diffs] xc/config/cf xprint_site.def, NONE,
1.1.2.1 site.def, 1.1.4.1.6.1.6.1, 1.1.4.1.6.1.6.2
Roland Mainz
xorg-commit at pdx.freedesktop.org
Mon Apr 12 20:16:32 PDT 2004
Committed by: gisburn
Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv9732/xc/config/cf
Modified Files:
Tag: XPRINT
site.def
Added Files:
Tag: XPRINT
xprint_site.def
Log Message:
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=462 - RFE: Merge xprint.mozdev.org Xprint enhancements into Xorg XPRINT branch
--- NEW FILE: xprint_site.def ---
/*
* Enable this if you want to build the GISWxprintglue package...
* #define BuildGISWxprintglue YES
* Then do a % make World ; cd packager/solaris/GISWxprintglue/ ; make make_GISWxprintglue
*/
/*
* Enable this if you want to build the GISWxprint package...
* #define BuildGISWxprint YES
* Then do a % make World ; cd packager/solaris/GISWxprint/ ; make make_GISWxprint
*/
/*
* Enable this if you want to build the Debian Xprint server package
* #define BuildDebianXprintPackage YES
*/
/*
* If you build a RPM package from this tree the xprint.spec file
* will set BuildXprintRPMPackage to YES
*/
/*
* Enable this if you want to build the Mozilla Xprint XPI server package
* #define BuildMozillaXprintXPIPackage YES
*/
/* HasDocBookTools - set to YES if "xsltproc", "xmllint", "docbook2man",
* "lynx" and the docbook-xsl-stylesheets are installed.
* #define HasDocBookTools YES
*/
/* #########################################################################
* ############ xprint.mozdev.org defaults start (do not edit!) ############
* #########################################################################
*/
#ifndef BuildGISWxprintglue
# define BuildGISWxprintglue NO
#endif /* BuildGISWxprintglue */
#ifndef BuildGISWxprint
# define BuildGISWxprint NO
#endif /* BuildGISWxprint */
#ifndef BuildDebianXprintPackage
# define BuildDebianXprintPackage NO
#endif /* BuildDebianXprintPackage */
#ifndef BuildXprintRPMPackage
# define BuildXprintRPMPackage NO
#endif /* BuildXprintRPMPackage */
#ifndef BuildMozillaXprintXPIPackage
# define BuildMozillaXprintXPIPackage NO
#endif /* BuildMozillaXprintXPIPackage */
/* If we do not build any of the special packages then build and
* install everything */
#ifndef BuildFullXprintDistrib
# if BuildGISWxprintglue || BuildGISWxprint || BuildDebianXprintPackage || BuildXprintRPMPackage || BuildMozillaXprintXPIPackage
# define BuildFullXprintDistrib NO
# else
# define BuildFullXprintDistrib YES
# endif /* BuildGISWxprintglue || BuildGISWxprint || BuildDebianXprintPackage || BuildXprintRPMPackage || BuildMozillaXprintXPIPackage */
#endif /* BuildFullXprintDistrib */
/* Verify that only one package is enabled at the same time */
#if (BuildGISWxprintglue + BuildGISWxprint + BuildDebianXprintPackage + BuildXprintRPMPackage + BuildFullXprintDistrib + BuildMozillaXprintXPIPackage) > 1
# error Building more than one special package is not allowed.
#endif /* Verify */
/* Some flags to build the Xprint server (Xprt), the tools and the fonts */
#define BuildServer YES
#define XprtServer YES
/* Build all Xprint DDX */
#define XpRasterDDX YES
#define XpColorPclDDX YES
#define XpMonoPclDDX YES
#define XpPostScriptDDX YES
#define XpPdfDDX NO
#define XpSvgDDX NO
#define BuildFonts NO
#define GzipFontCompression YES
#define BuildFreeType YES
/* Xprt does not have special support for GLX and XIE (yet) */
#define BuildGlxExt NO
#define BuildXIE NO
/* X extensions not needed */
#define BuildDBE NO
#define BuildXKB NO
#define BuildRECORD NO
#define BuildDPMS NO
#define BuildXF86VidModeExt NO
#define BuildXInputExt NO
#define BuildScreenSaverExt NO
#define BuildXvExt NO
/* LBX is needed for compatibility to the XWeb stuff */
#define BuildLBX YES
/* Xprt's non-bitmap based DDX (PS, PCL, PDF, SVGprint etc.) cannot support MIT-SHM */
#undef HasShm
#define HasShm NO
/* Disable stipple code due portability issues
* (see http://xprint.mozdev.org/bugs/show_bug.cgi?id=2220) */
#define BuildStippleCode NO
/* Temporary for Xorg tree */
#define BuildFontconfigLibrary NO
#define XorgServer NO
#define XF86Server NO
#define XnestServer NO
#define XVirtualFramebufferServer NO
#define BuildFreetype2Library YES
#define HasFreetype2 NO
#define BuildXTrueType NO
#define BuildType1 NO
#define BuildCID NO
#define BuildSpeedo NO
#define BuildFontCache NO
#define BuildRender NO
#define BuildRenderLibrary NO
/* CAUTION: The XF86 "smart" scheduler breaks Xprt */
#define UseSmartScheduler NO
/* Build only Xprint applications */
#ifndef BuildXprintAppsOnly
#define BuildXprintAppsOnly YES
#endif /* BuildXprintAppsOnly */
/* Set our own XVendorString/XVendorRelease
* (and to avoid that xfree86.cf sets it's own stuff here) */
#define XVendorString "xprint.mozdev.org"
#define XVendorRelease 100000
#define UseHackLinkAgainstInstalledX11Libs YES
#ifdef UseHackLinkAgainstInstalledX11Libs
/* "Hack" to reuse an already installed X11 distribution when linking our
* programs (this assumes that the installed X version is at least X11R6.4) */
# ifndef IBMArchitecture
# define LdPreLib -L$(USRLIBDIR) -R$(USRLIBDIR) -L$(BUILDLIBDIR)
# endif /* !IBMArchitecture */
#endif /* UseHackLinkAgainstInstalledX11Libs */
XCOMM #### Sun/Solaris-specifc stuff ... ####
#if defined(SunArchitecture) && (OSMajorVersion > 4)
#undef XsunServer
#define XsunServer NO
XCOMM Some build hacks for the GISWxprintglue package
#if BuildGISWxprintglue
# define ProjectRoot /usr/openwin
# define ServerConfigDir /usr/openwin/server/etc
# define BinDir /opt/GISWxprintglue/bin
# define ManDirectoryRoot /opt/GISWxprintglue/man
# undef XPrintDir
# define XPrintDir /opt/GISWxprintglue/server/etc/XpConfig
/* PCL DDXs are currently defunct in Solaris Xprt, so do not ship the
* config files for now */
# undef XpColorPclDDX
# define XpColorPclDDX NO
# undef XpMonoPclDDX
# define XpMonoPclDDX NO
/* GISWxprintglue uses the Solaris Xprt server which uses the Solaris
* encoding/ttmap files for font encodings
*/
# define InstallXF86EncodingFiles NO
#endif /* BuildGISWxprintglue */
XCOMM Some build hacks for the GISWxprint package
#if BuildGISWxprint
# define ProjectRoot /usr/openwin
# define ServerConfigDir /usr/openwin/server/etc
# define BinDir /opt/GISWxprint/bin
# define ManDirectoryRoot /opt/GISWxprint/man
# undef XPrintDir
# define XPrintDir /opt/GISWxprint/server/etc/XpConfig
/* PCL DDXs are currently defunct in Solaris Xprt, so do not ship the
* config files for now */
# undef XpColorPclDDX
# define XpColorPclDDX NO
# undef XpMonoPclDDX
# define XpMonoPclDDX NO
/* Make sure we install our own encoding files since Solaris uses a format we
* (currently) do not support (yet).
*/
# define InstallXF86EncodingFiles YES
# undef XF86EncodingsPath
# define XF86EncodingsPath /opt/GISWxprint/lib/X11/fonts/encodings
#endif /* GISWxprint */
/* Install XF86 encoding files since that's the only format we currently support */
#ifndef InstallXF86EncodingFiles
#define InstallXF86EncodingFiles YES
#endif /* InstallXF86EncodingFiles */
#define HasVarDirectory NO
#undef HasMotif2
#define HasMotif2 YES
#if 1 /* Switch for 32bit binaries or 64bit binaries */
/* 32bit SPARC */
# define CcCmd /opt/SUNWspro/bin/cc
# define CplusplusCmd /opt/SUNWspro/bin/CC
#else
/* 64bit sparc (Doesn't really work yet because the Xservers cannot link properly... ;-( */
# define ServerExtraDefines -D_XSERVER64
# define CcCmd /opt/SUNWspro/bin/cc -xarch=v9a
# define CplusplusCmd /opt/SUNWspro/bin/CC -xarch=v9a
# define UsrLibDir /usr/openwin/lib/sparcv9
#endif
#if 0 /* Development only */
XCOMM Explicitly use "-xs" to make Rational Purify "happy"
# undef OptimizedCDebugFlags
# define OptimizedCDebugFlags -xs -g -DDEBUG_$(LOGNAME)
#endif
XCOMM #### FreeBSD-specifc stuff ... ####
#elif defined(FreeBSDArchitecture)
#define ProjectRoot /usr/X11R6
#define DlLibrary -lc
#undef XF86SVGAServer
#define XF86SVGAServer NO
#define HasVarDirectory NO
#define HasMotif2 YES
#define HasGhostScript YES
#define InstallXF86EncodingFiles NO
XCOMM #### NetBSD-specifc stuff ... ####
#elif defined(NetBSDArchitecture)
#define ProjectRoot /usr/X11R6
#undef XF86SVGAServer
#define XF86SVGAServer NO
#define HasVarDirectory NO
#define HasMotif2 YES
#define HasGhostScript YES
#define InstallXF86EncodingFiles NO
XCOMM #### Linux-specifc stuff ... ####
#elif defined(LinuxArchitecture)
#undef XF86SVGAServer
#define XF86SVGAServer NO
#define HasVarDirectory NO
#define HasMotif2 YES
#define HasGhostScript YES
#define InstallXF86EncodingFiles NO
/* Debian Xprint package puts the Xprt config files elsewhere */
#if (LinuxDistribution == LinuxDebian)
# define XPrintDir /usr/share/Xprint/xserver
#endif
#endif
/* Do not strip binaries to ensure usefull stacktraces in bug reports
* (http://xprint.mozdev.org/bugs/show_bug.cgi?id=2264)
*/
#define StripInstalledPrograms NO
/* Is Motif2 installed ? */
#ifndef HasMotif2
#define HasMotif2 NO
#endif /* HasMotif2 */
/* Are GhostScript and related tools (like ps2pdf) installed ? */
#ifndef HasGhostScript
#define HasGhostScript NO
#endif /* HasGhostScript */
/* Is GhostPCL installed ? */
#ifndef HasGhostPCL
#define HasGhostPCL NO
#endif /* HasGhostPCL */
/* Does the X11 installation have the Xfree86 encoding files ? */
#ifndef InstallXF86EncodingFiles
#define InstallXF86EncodingFiles YES
#endif /* InstallXF86EncodingFiles */
INSTALLXF86ENCODINGFILES = InstallXF86EncodingFiles
#ifndef XF86EncodingsPath
#define XF86EncodingsPath $(FONTDIR)/encodings
#endif /* XF86EncodingsPath *
/* #########################################################################
* ################ xprint.mozdev.org defaults end ################
* #########################################################################
*/
/**
** Extra rules for Xprint - DO NOT EDIT!!!!
**/
/*
* InstallXpPMFLink - install link for a PMF font from one
* print model to another
*/
#ifndef InstallXpPMFLink
#define InstallXpPMFLink(fontfilename,srcmodelfontdir,destmodelfontdir) @@\
InstallLink(install,srcmodelfontdir/fontfilename,fontfilename,destmodelfontdir)
#endif /* InstallXpPMFLink */
/*
* InstallXpMultiplePMFLinks - install multiple links for PMF fonts
* from one print model to another
*/
#ifndef InstallXpMultiplePMFLinks
#define InstallXpMultiplePMFLinks(list,srcmodelfontdir,destmodelfontdir) @@\
install:: @@\
MakeDir($(DESTDIR)destmodelfontdir) @@\
for i in list ; do \ @@\
$(RM) $(DESTDIR)destmodelfontdir/$$i ; \ @@\
$(LN) -s -f srcmodelfontdir/$$i $(DESTDIR)destmodelfontdir/$$i ; \ @@\
done
#endif /* InstallXpPMFLink */
/*
* InstallXpPMFFontsDir - make and install a fonts.dir index for model-config fonts
*/
#ifndef InstallXpPMFFontsDir
#define InstallXpPMFFontsDir(destmodelfontdir) @@\
install:: @@\
(cd $(DESTDIR)destmodelfontdir ; PATH=$(DESTDIR)/$(PROJECTROOT)/bin:$(PROJECTROOT)/bin:$${PATH} mkfontdir)
#endif /* InstallXpPMFFontsDir */
Index: site.def
===================================================================
RCS file: /cvs/xorg/xc/config/cf/site.def,v
retrieving revision 1.1.4.1.6.1.6.1
retrieving revision 1.1.4.1.6.1.6.2
diff -u -d -r1.1.4.1.6.1.6.1 -r1.1.4.1.6.1.6.2
--- a/site.def 10 Apr 2004 09:03:31 -0000 1.1.4.1.6.1.6.1
+++ b/site.def 13 Apr 2004 03:16:30 -0000 1.1.4.1.6.1.6.2
@@ -38,12 +38,12 @@
* Include this for easy XFree86 customisations
*/
#ifndef SiteIConfigFiles
-#define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def
+#define SiteIConfigFiles $(IRULESRC)/xprint_site.def $(IRULESRC)/host.def
#endif
#include <host.def>
-#include <xorgsite.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
More information about the xorg-commit-diffs
mailing list