diff options
| author | George Kiagiadakis <gkiagia@tolabaki.gr> | 2016-07-09 11:00:19 +0300 |
|---|---|---|
| committer | George Kiagiadakis <gkiagia@tolabaki.gr> | 2016-07-09 11:00:19 +0300 |
| commit | 3e95511674daf34b3af087042bde1ec665457360 (patch) | |
| tree | 94d1032638fca43c66ed6ce769b7fed570c88629 /configure.ac | |
| parent | ac4b6037dcba865dae03e3808173135402cdfd09 (diff) | |
| parent | d07359343e76d1745d18f276eec90ab5056917b0 (diff) | |
| download | wocky-3e95511674daf34b3af087042bde1ec665457360.tar.gz | |
Merge branch 'gabble-0.18'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index fc2ef86..779e90c 100644 --- a/configure.ac +++ b/configure.ac @@ -119,22 +119,14 @@ AC_C_BIGENDIAN dnl Check for Glib PKG_CHECK_MODULES(GLIB, - [glib-2.0 >= 2.32, gobject-2.0 >= 2.32, gthread-2.0 >= 2.32, gio-2.0 >= 2.32]) + [glib-2.0 >= 2.44, gobject-2.0 >= 2.44, gthread-2.0 >= 2.44, gio-2.0 >= 2.44]) -AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32], [Ignore post 2.32 deprecations]) -AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevent post 2.32 APIs]) +AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_44], [Ignore post 2.44 deprecations]) +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_44], [Prevent post 2.44 APIs]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -dnl Check GIO proxy support -PKG_CHECK_EXISTS([gio-2.0 >= 2.25.15], - [HAVE_GIO_PROXY=yes - AC_DEFINE(HAVE_GIO_PROXY, [1], [Defined if GIO supports proxy])], - [HAVE_GIO_PROXY=no]) -AM_CONDITIONAL(HAVE_GIO_PROXY, [test "x${HAVE_GIO_PROXY}" = "xyes"]) - - dnl Choose an SSL/TLS backend (default gnutls) AC_ARG_WITH([tls], AC_HELP_STRING([--with-tls=BACKEND], |