Refix for https://freedesktop.org/bugzilla/show_bug.cgi?id=909 - Disable

    build of PDF documents where GhostScript may not work at build time.

4 files changed, 26 insertions, 4 deletions

diff --git a/FreeBSD.cf b/FreeBSD.cf
index 394b159..6db47d2 100644
--- a/FreeBSD.cf
+++ b/FreeBSD.cf
@@ -1,5 +1,5 @@
 XCOMM platform:  $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $
-XCOMM platform:  $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.7 2004/07/17 22:17:24 anholt Exp $
+XCOMM platform:  $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.8 2004/07/22 06:39:04 anholt Exp $
 XCOMM
 XCOMM
 XCOMM
@@ -71,6 +71,12 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #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
diff --git a/Imake.tmpl b/Imake.tmpl
index 3045657..cc8d627 100644
--- a/Imake.tmpl
+++ b/Imake.tmpl
@@ -1,7 +1,7 @@
 XCOMM ----------------------------------------------------------------------
 XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
 XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.4 2004/06/26 16:26:18 ago Exp $
+XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.5 2004/07/21 07:31:09 anholt Exp $
 XCOMM
 XCOMM
 XCOMM
@@ -1542,7 +1542,10 @@ TCLIBDIR = TclLibDir
 #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
diff --git a/NetBSD.cf b/NetBSD.cf
index 39c1659..fd21b4e 100644
--- a/NetBSD.cf
+++ b/NetBSD.cf
@@ -47,6 +47,12 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #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
 /*
diff --git a/linux.cf b/linux.cf
index 002389a..8a21e43 100644
--- a/linux.cf
+++ b/linux.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.8 2004/07/20 17:48:09 sandmann Exp $
+XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.9 2004/07/22 06:39:04 anholt Exp $
 XCOMM platform:  $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
@@ -79,6 +79,13 @@ XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi
 # define LinuxCLibTeenyVersion	DefaultLinuxCLibTeenyVersion
 #endif
 
+#ifndef HasGhostScript
+# define HasGhostScript YES
+#endif
+#ifndef BuildPDFdocs
+# define BuildPDFdocs NO
+#endif
+
 #ifndef LinuxBinUtilsMajorVersion
 # define LinuxBinUtilsMajorVersion	DefaultLinuxBinUtilsMajorVersion
 #endif