diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2009-03-23 19:16:58 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-03-23 19:16:58 -0400 |
| commit | 477747bc1ef1078b06c4e1c615a1a912e6ada299 (patch) | |
| tree | c874705da88f5e29d8cba9abefd55d172547682d | |
| parent | 698203ab28bc679c2e62a2452a79d5785fd46ca7 (diff) | |
| download | pango-477747bc1ef1078b06c4e1c615a1a912e6ada299.tar.gz | |
Bug 576298 – Fails to link pango-view if --without-x is specified but cairo has X11 support
| -rw-r--r-- | pango-view/pango-view.c | 2 | ||||
| -rw-r--r-- | pango-view/viewer-cairo.c | 4 |
2 files changed, 5 insertions, 1 deletions
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 <cairo-xlib.h> @@ -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; |