[gs-cvs] rev 9535 - in trunk/gs: base cups

[till at ghostscript.com]

Author: till
Date: 2009-03-07 13:46:16 -0800 (Sat, 07 Mar 2009)
New Revision: 9535

Modified:
   trunk/gs/base/Makefile.in
   trunk/gs/base/configure.ac
   trunk/gs/cups/cups.mak
Log:
Let pdftoraster CUPS filter not be build with CUPS < 1.2 and allow suppressing build of pdftoraster via command line option (needed for Mac OS X).


Modified: trunk/gs/base/Makefile.in
===================================================================
--- trunk/gs/base/Makefile.in	2009-03-07 17:15:28 UTC (rev 9534)
+++ trunk/gs/base/Makefile.in	2009-03-07 21:46:16 UTC (rev 9535)
@@ -82,6 +82,7 @@
 CUPSSERVERBIN=@CUPSSERVERBIN@
 CUPSSERVERROOT=@CUPSSERVERROOT@
 CUPSDATA=@CUPSDATA@
+CUPSPDFTORASTER=@CUPSPDFTORASTER@
 
 # Define the default directory/ies for the runtime
 # initialization and font files.  Separate multiple directories with a :.

Modified: trunk/gs/base/configure.ac
===================================================================
--- trunk/gs/base/configure.ac	2009-03-07 17:15:28 UTC (rev 9534)
+++ trunk/gs/base/configure.ac	2009-03-07 21:46:16 UTC (rev 9535)
@@ -420,6 +420,9 @@
 AC_ARG_ENABLE([cups], AC_HELP_STRING([--disable-cups],
     [Don't include CUPS support]))
 
+AC_ARG_WITH([pdftoraster], AC_HELP_STRING([--without-pdftoraster],
+    [Don't include CUPS' pdftoraster filter]))
+
 CUPSDEV=""
 CUPSINCLUDE=""
 CUPSCFLAGS=""
@@ -429,6 +432,8 @@
 CUPSSERVERBIN=""
 CUPSSERVERROOT=""
 CUPSDATA=""
+CUPSVERSION="0"
+CUPSPDFTORASTER="0"
 
 if ( test -d cups ); then
     if test x$enable_cups != xno; then
@@ -446,6 +451,12 @@
 	    CUPSDATA="`$CUPSCONFIG --datadir`"
 	    CUPSINCLUDE="include cups/cups.mak"
 	    CUPSDEV="\$(DD)cups.dev"
+	    CUPSVERSION="`$CUPSCONFIG --version`"
+	    if ( test x$with_pdftoraster != xno ); then
+	        if test "$CUPSVERSION" ">" "1.2"; then
+		    CUPSPDFTORASTER="1"
+		fi
+	    fi
 	fi
     fi
 fi
@@ -458,6 +469,7 @@
 AC_SUBST(CUPSSERVERBIN)
 AC_SUBST(CUPSSERVERROOT)
 AC_SUBST(CUPSDATA)
+AC_SUBST(CUPSPDFTORASTER)
 
 
 dnl look for IJS implementation

Modified: trunk/gs/cups/cups.mak
===================================================================
--- trunk/gs/cups/cups.mak	2009-03-07 17:15:28 UTC (rev 9534)
+++ trunk/gs/cups/cups.mak	2009-03-07 21:46:16 UTC (rev 9535)
@@ -33,6 +33,7 @@
 # CUPSSERVERBIN=`cups-config --serverbin`
 # CUPSSERVERROOT=`cups-config --serverroot`
 # CUPSDATA=`cups-config --datadir`
+# CUPSPDFTORASTER= 1 if CUPS is new enough (cups-config --version)
 
 $(DD)cups.dev : $(CUPS_MAK) $(cups_) $(GLD)page.dev
 	$(SETPDEV2) $(DD)cups $(cups_)
@@ -49,18 +50,24 @@
 pdftoraster_=cups/pdftoraster.c
 
 $(PDFTORASTER_XE): $(pdftoraster_)
-	$(GLCC) $(LDFLAGS) -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_) `cups-config --image --libs`
+	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
+	    $(GLCC) $(LDFLAGS) -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_) `cups-config --image --libs`; \
+	fi
 
 install:	install-cups
 
 install-cups: cups
 	-mkdir -p $(DESTDIR)$(CUPSSERVERBIN)/filter
 	$(INSTALL_PROGRAM) cups/pstoraster $(DESTDIR)$(CUPSSERVERBIN)/filter
-	$(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter
+	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
+	    $(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \
+	fi
 	$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter
 	-mkdir -p $(DESTDIR)$(CUPSSERVERROOT)
 	$(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSSERVERROOT)
-	$(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT)
+	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
+	    $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
+	fi
 	-mkdir -p $(DESTDIR)$(CUPSDATA)/model
 	$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model
 	$(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model