summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-28 18:34:17 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-28 18:34:17 +0200
commitd7c98e7a6ec28a6c76bccf16d83f36b34a705410 (patch)
tree66807ada649997bb6e5c8928a6a95870f43d926e /configure.ac
parentc6a2dafb2fc5d186ef146035f270a4819075eab1 (diff)
parent8d8befaeca0d9ed3f096780e499a3231f16585c4 (diff)
downloadrsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.tar.gz
rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.tar.xz
rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.zip
Merge branch 'beta' into master
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 66f1cab1..7150d211 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)