summaryrefslogtreecommitdiffstats
path: root/src/extension/init.cpp
diff options
context:
space:
mode:
authorAlexander Valavanis <valavanisalex@gmail.com>2019-01-19 13:58:54 +0000
committerAlexander Valavanis <valavanisalex@gmail.com>2019-01-19 13:58:54 +0000
commit199c3dd0acac8c7a7cc835067e07ad6c4c069015 (patch)
treecf6f24a57943858136ffc41366de6502d28c9d65 /src/extension/init.cpp
parentderive all toolbars from Inkscape::Toolbar (diff)
parentDisable app menu (deprecated in GTK 3.32). (diff)
downloadinkscape-199c3dd0acac8c7a7cc835067e07ad6c4c069015.tar.gz
inkscape-199c3dd0acac8c7a7cc835067e07ad6c4c069015.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/extension/init.cpp')
-rw-r--r--src/extension/init.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 8e3c757f8..6626ff20d 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -36,9 +36,12 @@
# include "internal/emf-print.h"
# include "internal/wmf-inout.h"
# include "internal/wmf-print.h"
-#ifdef HAVE_CAIRO_PDF
+
+#include <cairo.h>
+#ifdef CAIRO_HAS_PDF_SURFACE
# include "internal/cairo-renderer-pdf-out.h"
-# include "internal/cairo-png-out.h"
+#endif
+#ifdef CAIRO_HAS_PS_SURFACE
# include "internal/cairo-ps-out.h"
#endif
#include "internal/pov-out.h"
@@ -152,11 +155,10 @@ init()
Internal::Svg::init();
Internal::Svgz::init();
-#ifdef HAVE_CAIRO_PDF
- //g_print ("Using CairoRendererPdfOutput: new pdf exporter\n");
+#ifdef CAIRO_HAS_PDF_SURFACE
Internal::CairoRendererPdfOutput::init();
- Internal::CairoRendererOutput::init();
-
+#endif
+#ifdef CAIRO_HAS_PS_SURFACE
Internal::CairoPsOutput::init();
Internal::CairoEpsOutput::init();
#endif