From 1e080d37ad18059cbd2ca7d39ceafece5b826623 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 14 Jul 2015 11:01:48 +0300 Subject: [PATCH 070/398] With --enable-gtk3 we need GLib >= 2.38 The G_ADD_PRIVATE used in libreofficekit/source/gtk/lokdocview.cxx is from 2.38. (cherry picked from commit f3df77accae2941ba9c6a5e48b84d661f7a87863) Change-Id: I2058932f8252d2715f970f020160f4f960987125 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d1d82ea28cad..4e27231f6a5f 100644 --- a/configure.ac +++ b/configure.ac @@ -9900,11 +9900,11 @@ if test "x$enable_gtk3" = "xyes"; then AC_MSG_ERROR([System cairo required for gtk3 support, do not combine --enable-gtk3 with --without-system-cairo]) fi : ${with_system_cairo:=yes} - PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") + PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") if test "x$ENABLE_GTK3" = "xTRUE"; then R="gtk3" else - AC_MSG_ERROR([gtk3 libraries of the correct versions, not found]) + AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found]) fi GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") fi -- 2.12.0