[gs-cvs] rev 8752 - trunk/gs/src

[giles at ghostscript.com]

Author: giles
Date: 2008-05-20 18:24:40 -0700 (Tue, 20 May 2008)
New Revision: 8752

Modified:
   trunk/gs/src/configure.ac
Log:
Protect the use of pkg-config for libcairo.


Modified: trunk/gs/src/configure.ac
===================================================================
--- trunk/gs/src/configure.ac	2008-05-21 01:24:38 UTC (rev 8751)
+++ trunk/gs/src/configure.ac	2008-05-21 01:24:40 UTC (rev 8752)
@@ -595,8 +595,22 @@
 AC_SUBST(SOC_LIBS)
 AC_SUBST(SOC_LOADER)
 
-CAIRO_CFLAGS=`pkg-config cairo --cflags`
-CAIRO_LIBS=`pkg-config cairo --libs`
+dnl enable the cairo device if the library is available
+CAIRO_DEVS=""
+CAIRO_CFLAGS=""
+CAIRO_LIBS=""
+AC_PATH_PROG(PKGCONFIG, pkg-config)
+if test "x$PKGCONFIG" != x; then
+  AC_MSG_CHECKING([for cairo])
+  CAIRO_CFLAGS=`pkg-config cairo --cflags`
+  CAIRO_LIBS=`pkg-config cairo --libs`
+  if test -z "$CAIRO_LIBS"; then
+    AC_MSG_RESULT([no])
+  else
+    CAIRO_DEVS="cairo"
+    AC_MSG_RESULT([yes])
+  fi
+fi
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
@@ -712,6 +726,7 @@
 			  PNG      = Output to PNG
                           PS       = Output to PostScript/PDF
                           TIFF     = Output to TIFF
+                          CAIRO    = Output using libcairo
 			  WTS      = WTS Halftoning devices
 			  ETS      = ETS Halftoning devices
                           You can mix both variants, e.g.
@@ -857,6 +872,10 @@
 		# PostScript/PDF writing
 		F_DEVS="$F_DEVS $PS_DEVS"
 		;;
+	CAIRO)
+		$ cairo output device
+		F_DEVS="$F_DEVS $CAIRO_DEVS"
+		;;
 	WTS)
 		# WTS Halftoning devices
 		F_DEVS="$F_DEVS $WTS_HALFTONING_DEVS"