From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 28 Jan 2014 18:52:52 +0000 (+0100)
Subject: Fix broken build with ./configure --without-cairo
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20140130030504%2Fpspp;p=pspp

Fix broken build with ./configure --without-cairo
---

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 7de2d0523a..5fe9dc0e6f 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -150,10 +150,11 @@ struct ascii_driver
     enum emphasis_style emphasis; /* How to emphasize text. */
     char *chart_file_name;      /* Name of files used for charts. */
 
+#ifdef HAVE_CAIRO
     /* Colours for charts */
     struct xr_color fg;
     struct xr_color bg;
-
+#endif
 
     int width;                  /* Page width. */
     int length;                 /* Page length minus margins and header. */
@@ -261,10 +262,10 @@ ascii_create (const char *file_name, enum settings_output_devices device_type,
   a->auto_width = a->width < 0;
   a->auto_length = paper_length < 0;
   a->length = paper_length - vertical_margins (a);
-
+#ifdef HAVE_CAIRO
   parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg);
   parse_color (d, o, "foreground-color", "#000000000000", &a->fg);
-
+#endif
   box = parse_enum (opt (d, o, "box", "ascii"),
                     "ascii", BOX_ASCII,
                     "unicode", BOX_UNICODE,
diff --git a/src/output/html.c b/src/output/html.c
index 822c6b5c9b..e8416756cb 100644
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -47,10 +47,10 @@
 struct html_driver
   {
     struct output_driver driver;
-
+#ifdef HAVE_CAIRO
     struct xr_color fg;
     struct xr_color bg;
-    
+#endif    
     char *file_name;
     char *chart_file_name;
 
@@ -104,10 +104,10 @@ html_create (const char *file_name, enum settings_output_devices device_type,
                                                       file_name));
   html->file = NULL;
   html->chart_cnt = 1;
-
+#ifdef HAVE_CAIRO
   parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &html->bg);
   parse_color (d, o, "foreground-color", "#000000000000", &html->fg);
-
+#endif
   html->file = fn_open (html->file_name, "w");
   if (html->file == NULL)
     {