summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-28 18:23:53 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-28 18:23:53 +0200
commit8d8befaeca0d9ed3f096780e499a3231f16585c4 (patch)
tree36afcf98e28dd7bba95e383d397e4f6ad84cbf01 /configure.ac
parentf8d9aad08222f59ba2d27437c1e2369896452aa1 (diff)
parent23dac82b684e966490de707a44144b3ad0ce2323 (diff)
downloadrsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.tar.gz
rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.tar.xz
rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.zip
Merge branch 'v3-stable' into beta
Conflicts: tests/Makefile.am
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 5aa64054..4da2a4ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -527,7 +527,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)