configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f3df77accae2941ba9c6a5e48b84d661f7a87863
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jul 14 11:01:48 2015 +0300
With --enable-gtk3 we need GLib >= 2.38
The G_ADD_PRIVATE used in libreofficekit/source/gtk/lokdocview.cxx is from
2.38.
Change-Id: I2058932f8252d2715f970f020160f4f960987125
diff --git a/configure.ac b/configure.ac
index 7c362aa6..87d7990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9972,11 +9972,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.2 gtk+-unix-print-3.0
gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
