diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 19:01:34 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 19:01:34 +0200 |
commit | 29cacc3c8ad6694b1ae2a5480fca7059773d06f0 (patch) | |
tree | 1c4996d03a90ddb4ad6ea236ee8f72194a13b99e /configure.ac | |
parent | cbbf1586a204a897a050b6cb294b120e3ff5f23c (diff) | |
parent | d7c98e7a6ec28a6c76bccf16d83f36b34a705410 (diff) | |
download | rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.gz rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.xz rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.zip |
Merge branch 'master' into v5-devel
Conflicts:
tests/Makefile.am
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 d8d17a96..13999395 100644 --- a/configure.ac +++ b/configure.ac @@ -573,7 +573,7 @@ AC_ARG_ENABLE(gnutls, [enable_gnutls=no] ) if test "x$enable_gnutls" = "xyes"; then - PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0) + PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.0) fi AM_CONDITIONAL(ENABLE_GNUTLS, test x$enable_gnutls = xyes) AC_SUBST(GNUTLS_CFLAGS) |