[gs-cvs] rev 8285 - in trunk/gs: cups src

[giles at ghostscript.com]

Author: giles
Date: 2007-10-10 11:42:35 -0700 (Wed, 10 Oct 2007)
New Revision: 8285

Modified:
   trunk/gs/cups/cups.mak
   trunk/gs/src/Makefile.in
   trunk/gs/src/configure.ac
Log:
Pass the results of calling cups-config to cups.mak from configure 
through the top-level makefile rather than calling cups-config directly, 
so that passing an alternate cups environment to configure works.
Bug 689496.

DETAILS:

This is more consistent, since configure and cups.mak were previously 
calling cups independently. However, setting the cups environment at
the make level my have accidentally worked before; it won't work now.


Modified: trunk/gs/cups/cups.mak
===================================================================
--- trunk/gs/cups/cups.mak	2007-10-10 17:40:38 UTC (rev 8284)
+++ trunk/gs/cups/cups.mak	2007-10-10 18:42:35 UTC (rev 8285)
@@ -24,9 +24,10 @@
 
 cups_=	$(GLOBJ)gdevcups.$(OBJ)
 
-CUPSSERVER=`cups-config --serverbin`
-CUPSCONFIG=`cups-config --serverroot`
-CUPSDATA=`cups-config --datadir`
+# These are set in the toplevel Makefile via autoconf(1)
+# CUPSSERVERBIN=`cups-config --serverbin`
+# CUPSSERVERROOT=`cups-config --serverroot`
+# CUPSDATA=`cups-config --datadir`
 
 $(DD)cups.dev:	$(cups_) $(GLD)page.dev
 	$(ADDMOD) $(DD)cups -lib cupsimage -lib cups
@@ -38,11 +39,11 @@
 install:	install-cups
 
 install-cups:
-	-mkdir -p $(DESTDIR)$(CUPSSERVER)/filter
-	$(INSTALL_PROGRAM) cups/pstoraster $(DESTDIR)$(CUPSSERVER)/filter
-	$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVER)/filter
-	-mkdir -p $(DESTDIR)$(CUPSCONFIG)
-	$(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSCONFIG)
+	-mkdir -p $(DESTDIR)$(CUPSSERVERBIN)/filter
+	$(INSTALL_PROGRAM) cups/pstoraster $(DESTDIR)$(CUPSSERVERBIN)/filter
+	$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter
+	-mkdir -p $(DESTDIR)$(CUPSSERVERROOT)
+	$(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSSERVERROOT)
 	-mkdir -p $(DESTDIR)$(CUPSDATA)/model
 	$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model
 	$(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model

Modified: trunk/gs/src/Makefile.in
===================================================================
--- trunk/gs/src/Makefile.in	2007-10-10 17:40:38 UTC (rev 8284)
+++ trunk/gs/src/Makefile.in	2007-10-10 18:42:35 UTC (rev 8285)
@@ -74,6 +74,11 @@
 exdir=$(gsdatadir)/examples
 GS_DOCDIR=$(docdir)
 
+# Define install location for 'cups' device/filter support
+CUPSSERVERBIN=@CUPSSERVERBIN@
+CUPSSERVERROOT=@CUPSSERVERROOT@
+CUPSDATA=@CUPSDATA@
+
 # Define the default directory/ies for the runtime
 # initialization and font files.  Separate multiple directories with a :.
 

Modified: trunk/gs/src/configure.ac
===================================================================
--- trunk/gs/src/configure.ac	2007-10-10 17:40:38 UTC (rev 8284)
+++ trunk/gs/src/configure.ac	2007-10-10 18:42:35 UTC (rev 8285)
@@ -350,9 +350,9 @@
 CUPSDEV=""
 CUPSINCLUDE=""
 CUPSCONFIG="${CUPSCONFIG:=}"
-cups_datadir="/usr/share/cups"
-cups_serverroot="/etc/cups"
-cups_serverbin="/usr/lib/cups"
+CUPSSERVERBIN=""
+CUPSSERVERROOT=""
+CUPSDATA=""
 
 if ( test -d cups ); then
     if test x$enable_cups != xno; then
@@ -363,9 +363,9 @@
 #	    LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --static --image --libs | sed -e '1,$s/-lssl//'` $LIBS"
 	    LIBS="`$CUPSCONFIG --ldflags` `$CUPSCONFIG --image --libs` $LIBS"
 	    CFLAGS="`$CUPSCONFIG --cflags` $CFLAGS"
-	    cups_serverroot="`$CUPSCONFIG --serverroot`"
-	    cups_serverbin="`$CUPSCONFIG --serverbin`"
-	    cups_datadir="`$CUPSCONFIG --datadir`"
+	    CUPSSERVERROOT="`$CUPSCONFIG --serverroot`"
+	    CUPSSERVERBIN="`$CUPSCONFIG --serverbin`"
+	    CUPSDATA="`$CUPSCONFIG --datadir`"
 	    CUPSINCLUDE="include cups/cups.mak"
 	    CUPSDEV="\$(DD)cups.dev"
 	fi
@@ -373,12 +373,12 @@
 fi
 
 AC_SUBST(CUPSDEV)
-AC_SUBST(CUPSCONFIG)
 AC_SUBST(CUPSINCLUDE)
-AC_SUBST(cups_datadir)
-AC_SUBST(cups_serverroot)
-AC_SUBST(cups_serverbin)
+AC_SUBST(CUPSSERVERBIN)
+AC_SUBST(CUPSSERVERROOT)
+AC_SUBST(CUPSDATA)
 
+
 dnl look for IJS implementation
 AC_ARG_WITH(ijs, AC_HELP_STRING([--with-ijs],[include IJS driver support]))
 dnl set safe defaults