diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-08-25 13:06:07 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-08-25 13:06:07 +0100 |
| commit | 31c7a20ff0c37c3304462d01422c4bedab2e37ba (patch) | |
| tree | 63c5ad878e4f9a00a6cac561e1ecb74a64a6b27b /configure.ac | |
| parent | bfe67ce54111082c5c60f66dffe2654ad79181cf (diff) | |
| parent | 51742b08e3b58ad9e563a138f6e545762ad87d57 (diff) | |
| download | wocky-31c7a20ff0c37c3304462d01422c4bedab2e37ba.tar.gz | |
Merge branch 'tls-handshake-async'
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b7e4acb..affc2a6 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,7 @@ GTK_DOC_CHECK dnl Check for Glib PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= -2.4, gio-2.0 >= 2.21, gnutls]) +2.4, gio-2.0 >= 2.21, gnutls >= 2.8.2]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) |