Ticket #3449: bump minimum glib2 requirement to 2.26.x

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
This commit is contained in:
Andrey Tataranovich 2015-10-20 19:40:45 +02:00 committed by Yury V. Zaytsev
parent e0c16d7399
commit 87a1354c32

View File

@ -8,12 +8,12 @@ AC_DEFUN([AC_G_MODULE_SUPPORTED], [
g_module_supported="" g_module_supported=""
found_gmodule=no found_gmodule=no
PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.14], [found_gmodule=yes], [:]) PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.26], [found_gmodule=yes], [:])
if test x"$found_gmodule" = xyes; then if test x"$found_gmodule" = xyes; then
g_module_supported="gmodule-no-export-2.0" g_module_supported="gmodule-no-export-2.0"
else else
dnl try fallback to the generic gmodule dnl try fallback to the generic gmodule
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.14], [found_gmodule=yes], [:]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.26], [found_gmodule=yes], [:])
if test x"$found_gmodule" = xyes; then if test x"$found_gmodule" = xyes; then
g_module_supported="gmodule-2.0" g_module_supported="gmodule-2.0"
fi fi
@ -78,9 +78,9 @@ AC_DEFUN([AC_CHECK_GLIB], [
AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@])) AS_HELP_STRING([--with-glib-static], [Link glib statically @<:@no@:>@]))
glib_found=no glib_found=no
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14], [glib_found=yes], [:]) PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.26], [glib_found=yes], [:])
if test x"$glib_found" = xno; then if test x"$glib_found" = xno; then
AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.14)]) AC_MSG_ERROR([glib-2.0 not found or version too old (must be >= 2.26)])
fi fi
]) ])