Make the Cairo and Pango libraries required rather than optional.

[pspp] / src / output / driver.c

diff --git a/src/output/driver.c b/src/output/driver.c
index be60cb2746f4d0dc96b3ae6ee9ea5fc8e4c162e9..55eac27d186d49c23a6ca3c154db9a740b51f105 100644 (file)
--- a/src/output/driver.c
+++ b/src/output/driver.c
@@ -418,19 +418,17 @@ output_driver_is_registered (const struct output_driver *driver)
   return output_driver_get_engine (driver) != NULL;
 }
 \f
-extern const struct output_driver_factory txt_driver_factory;
-extern const struct output_driver_factory list_driver_factory;
-extern const struct output_driver_factory html_driver_factory;
 extern const struct output_driver_factory csv_driver_factory;
+extern const struct output_driver_factory html_driver_factory;
+extern const struct output_driver_factory list_driver_factory;
 extern const struct output_driver_factory odt_driver_factory;
-extern const struct output_driver_factory spv_driver_factory;
-#ifdef HAVE_CAIRO
 extern const struct output_driver_factory pdf_driver_factory;
+extern const struct output_driver_factory png_driver_factory;
 extern const struct output_driver_factory ps_driver_factory;
+extern const struct output_driver_factory spv_driver_factory;
 extern const struct output_driver_factory svg_driver_factory;
-extern const struct output_driver_factory png_driver_factory;
-#endif
 extern const struct output_driver_factory tex_driver_factory;
+extern const struct output_driver_factory txt_driver_factory;
 
 static const struct output_driver_factory *factories[] =
   {
@@ -440,12 +438,10 @@ static const struct output_driver_factory *factories[] =
     &csv_driver_factory,
     &odt_driver_factory,
     &spv_driver_factory,
-#ifdef HAVE_CAIRO
     &pdf_driver_factory,
     &ps_driver_factory,
     &svg_driver_factory,
     &png_driver_factory,
-#endif
     &tex_driver_factory,
     NULL
   };