Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.139 diff -u -r1.139 ChangeLog --- xc/ChangeLog 28 Jul 2004 01:20:32 -0000 1.139 +++ xc/ChangeLog 28 Jul 2004 02:52:54 -0000 @@ -1,3 +1,11 @@ +004-07-27 Roland Mainz + * xc/config/cf/FreeBSD.cf + * xc/config/cf/Imake.tmpl + * xc/config/cf/NetBSD.cf + * xc/config/cf/linux.cf + Bugzilla #909: Disable build of PDF documents where GhostScript may + not work at build time. + 2004-07-27 Torrey T. Lyons * programs/Xserver/Xprint/ddxInit.c: Index: xc/config/cf/FreeBSD.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/FreeBSD.cf,v retrieving revision 1.8 diff -u -r1.8 FreeBSD.cf --- xc/config/cf/FreeBSD.cf 22 Jul 2004 06:39:04 -0000 1.8 +++ xc/config/cf/FreeBSD.cf 28 Jul 2004 02:52:54 -0000 @@ -71,6 +71,12 @@ #define HasNCurses YES #define HasVarRun YES #define HasVarDb YES +#ifndef HasGhostScript +# define HasGhostScript YES +#endif +#ifndef BuildPDFdocs +# define BuildPDFdocs NO +#endif #if (OSMajorVersion >= 3) #define HasIssetugid YES #define HasPoll YES Index: xc/config/cf/Imake.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v retrieving revision 1.5 diff -u -r1.5 Imake.tmpl --- xc/config/cf/Imake.tmpl 21 Jul 2004 07:31:09 -0000 1.5 +++ xc/config/cf/Imake.tmpl 28 Jul 2004 02:53:02 -0000 @@ -1542,7 +1542,10 @@ #ifndef HasGhostScript #define HasGhostScript NO #endif -#if HasGhostScript +#ifndef BuildPDFdocs +#define BuildPDFdocs (HasGhostScript) +#endif +#if BuildPDFdocs #define PsToPdfCmd GhostScriptCmd -q -sOutputFile=- -sDEVICE=pdfwrite -dSAFER -dNOPAUSE - #endif #if HasSentinel Index: xc/config/cf/NetBSD.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/NetBSD.cf,v retrieving revision 1.4 diff -u -r1.4 NetBSD.cf --- xc/config/cf/NetBSD.cf 22 Jul 2004 06:39:04 -0000 1.4 +++ xc/config/cf/NetBSD.cf 28 Jul 2004 02:53:02 -0000 @@ -47,6 +47,12 @@ #ifndef HasLibCrypt # define HasLibCrypt YES #endif +#ifndef HasGhostScript +# define HasGhostScript YES +#endif +#ifndef BuildPDFdocs +# define BuildPDFdocs NO +#endif #ifndef HasShm # if OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2 /* Index: xc/config/cf/linux.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/linux.cf,v retrieving revision 1.9 diff -u -r1.9 linux.cf --- xc/config/cf/linux.cf 22 Jul 2004 06:39:04 -0000 1.9 +++ xc/config/cf/linux.cf 28 Jul 2004 02:53:03 -0000 @@ -79,6 +79,13 @@ # define LinuxCLibTeenyVersion DefaultLinuxCLibTeenyVersion #endif +#ifndef HasGhostScript +# define HasGhostScript YES +#endif +#ifndef BuildPDFdocs +# define BuildPDFdocs NO +#endif + #ifndef LinuxBinUtilsMajorVersion # define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion #endif