diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-07-26 00:35:25 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-07-26 00:35:25 -0400 |
| commit | 030aa540ef9dbd405b422cb18305ff62c090c386 (patch) | |
| tree | 581e8e5b602b69ae88188117bb5b75fdd9b973fd /configure.ac | |
| parent | 62d785a6b71ba46615b4808db5b25d7404134563 (diff) | |
| download | gtk+-030aa540ef9dbd405b422cb18305ff62c090c386.tar.gz | |
Fix x11-less build
We don't use pangoft2 at all in libgdk, but we are using it in libgtk
both under X and Wayland.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 28073626b2..041fc8172f 100644 --- a/configure.ac +++ b/configure.ac @@ -1323,9 +1323,6 @@ LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version" -if test "x$enable_x11_backend" = xyes; then - GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2" -fi PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" @@ -1360,7 +1357,7 @@ PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version" -if test "x$enable_x11_backend" = xyes; then +if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" fi if test "$have_gio_unix" = "yes"; then |