configure.ac | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 34cf34d6514b5ab581ec09b2689642b18a2d9cf4
Author: Mark Wielaard <m...@klomp.org>
Date: Tue May 14 13:15:53 2013 +0200
Require at least gio 2.26 for the dbus support.
Change-Id: I6276d55081098f567104f61fde896d1b66591522
Reviewed-on: https://gerrit.libreoffice.org/3904
Reviewed-by: Bosdonnat Cedric <cedric.bosdon...@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdon...@free.fr>
diff --git a/configure.ac b/configure.ac
index dc578d7..f35d2da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9484,10 +9484,12 @@ if test "$test_gtk" = "yes"; then
if test "$ENABLE_GNOMEVFS" = "TRUE"; then
AC_MSG_ERROR([please use --enable-gio only together with
--disable-gnome-vfs.])
fi
- ENABLE_GIO="TRUE"
- AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( GIO, gio-2.0 )
- AC_DEFINE(ENABLE_GIO)
+ dnl Need at least 2.26 for the dbus support.
+ PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.26],
+ [ENABLE_GIO="TRUE"], [ENABLE_GIO=""])
+ if test "$ENABLE_GIO" = "TRUE"; then
+ AC_DEFINE(ENABLE_GIO)
+ fi
else
AC_MSG_RESULT([no])
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
