Make the Cairo and Pango libraries required rather than optional.

[pspp] / src / output / spv / spv.h

diff --git a/src/output/spv/spv.h b/src/output/spv/spv.h
index fdcd9f9f8daf804d172e9a14e1d4ad33f6aa7905..eda7704dd70e746b257175df905dcdd67cafe59f 100644 (file)
--- a/src/output/spv/spv.h
+++ b/src/output/spv/spv.h
@@ -26,14 +26,11 @@
    top-level headings as a child item.
  */
 
+#include <cairo.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#ifdef HAVE_CAIRO
-#include <cairo.h>
-#endif
-
 #include "libpspp/compiler.h"
 
 struct fmt_spec;
@@ -145,9 +142,7 @@ struct spv_item
 
     /* SPV_ITEM_IMAGE only. */
     char *png_member;
-#ifdef HAVE_CAIRO
     cairo_surface_t *image;
-#endif
   };
 
 void spv_item_format_path (const struct spv_item *, struct string *);
@@ -170,9 +165,7 @@ bool spv_item_is_text (const struct spv_item *);
 const struct pivot_value *spv_item_get_text (const struct spv_item *);
 
 bool spv_item_is_image (const struct spv_item *);
-#ifdef HAVE_CAIRO
 cairo_surface_t *spv_item_get_image (const struct spv_item *);
-#endif
 
 bool spv_item_is_visible (const struct spv_item *);