From 477747bc1ef1078b06c4e1c615a1a912e6ada299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 23 Mar 2009 19:16:58 -0400 Subject: =?UTF-8?q?Bug=20576298=20=E2=80=93=20Fails=20to=20link=20pango-vi?= =?UTF-8?q?ew=20if=20--without-x=20is=20specified=20but=20cairo=20has=20X1?= =?UTF-8?q?1=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pango-view/pango-view.c | 2 +- pango-view/viewer-cairo.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pango-view/pango-view.c b/pango-view/pango-view.c index 55a62edc..fec00be9 100644 --- a/pango-view/pango-view.c +++ b/pango-view/pango-view.c @@ -7,7 +7,7 @@ extern const PangoViewer pangoft2_viewer; extern const PangoViewer pangox_viewer; const PangoViewer *viewers[] = { -#ifdef HAVE_CAIRO_XLIB +#ifdef HAVE_CAIRO &pangocairo_viewer, #endif #ifdef HAVE_XFT diff --git a/pango-view/viewer-cairo.c b/pango-view/viewer-cairo.c index 72aae5d5..ae8e01d2 100644 --- a/pango-view/viewer-cairo.c +++ b/pango-view/viewer-cairo.c @@ -30,6 +30,7 @@ #ifdef HAVE_CAIRO_XLIB +#ifdef HAVE_X #include "viewer-x.h" #include @@ -72,6 +73,7 @@ static CairoViewerIface cairo_x_viewer_iface = { cairo_x_view_iface_create_surface, cairo_x_view_iface_paint_background }; +#endif /* HAVE_X */ #endif /* HAVE_CAIRO_XLIB */ @@ -348,11 +350,13 @@ cairo_viewer_iface_create (const CairoViewerIface **iface) return ret; #ifdef HAVE_CAIRO_XLIB +#ifdef HAVE_X if (opt_display) { *iface = &cairo_x_viewer_iface; return (*iface)->backend_class->create ((*iface)->backend_class); } +#endif /* HAVE_X */ #endif /* HAVE_CAIRO_XLIB */ *iface = &cairo_image_viewer_iface; -- cgit v1.2.1