Index: configure
--- configure.orig	2016-07-23 18:52:00.000000000 +0200
+++ configure	2017-04-09 23:05:35.919024000 +0200
@@ -15932,8 +15932,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pspp_cv_build_exeext" >&5
 $as_echo "$pspp_cv_build_exeext" >&6; }
   EXEEXT_FOR_BUILD=""
-  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex
-t}
+  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeext}
 fi
 
 
Index: src/output/cairo.c
--- src/output/cairo.c.orig	2016-02-21 06:38:52.000000000 +0100
+++ src/output/cairo.c	2017-04-09 23:56:35.963403000 +0200
@@ -48,7 +48,9 @@
 
 #include <cairo/cairo-pdf.h>
 #include <cairo/cairo-ps.h>
+#if 0
 #include <cairo/cairo-svg.h>
+#endif
 #include <cairo/cairo.h>
 #include <math.h>
 #include <pango/pango-font.h>
@@ -425,8 +427,10 @@
     surface = cairo_pdf_surface_create (file_name, width_pt, length_pt);
   else if (file_type == XR_PS)
     surface = cairo_ps_surface_create (file_name, width_pt, length_pt);
+#if 0
   else if (file_type == XR_SVG)
     surface = cairo_svg_surface_create (file_name, width_pt, length_pt);
+#endif
   else
     NOT_REACHED ();
 
@@ -493,6 +497,7 @@
   return od ;
 }
 
+#if 0
 static struct output_driver *
 xr_svg_create (struct file_handle *fh, enum settings_output_devices device_type,
                struct string_map *o)
@@ -501,6 +506,7 @@
   fh_unref (fh);
   return od ;
 }
+#endif
 
 static void
 xr_destroy (struct output_driver *driver)
@@ -1242,8 +1248,10 @@
   { "pdf", "pspp.pdf", xr_pdf_create };
 struct output_driver_factory ps_driver_factory =
   { "ps", "pspp.ps", xr_ps_create };
+#if 0
 struct output_driver_factory svg_driver_factory =
   { "svg", "pspp.svg", xr_svg_create };
+#endif
 
 static const struct output_driver_class cairo_driver_class =
 {
Index: src/output/driver.c
--- src/output/driver.c.orig	2016-02-20 06:36:08.000000000 +0100
+++ src/output/driver.c	2017-04-09 23:56:53.367947000 +0200
@@ -293,8 +293,10 @@
 #ifdef HAVE_CAIRO
 extern const struct output_driver_factory pdf_driver_factory;
 extern const struct output_driver_factory ps_driver_factory;
+#if 0
 extern const struct output_driver_factory svg_driver_factory;
 #endif
+#endif
 
 static const struct output_driver_factory *factories[] =
   {
@@ -308,8 +310,10 @@
 #ifdef HAVE_CAIRO
     &pdf_driver_factory,
     &ps_driver_factory,
+#if 0
     &svg_driver_factory,
 #endif
+#endif
     NULL
   };