aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-04-06 15:45:28 +0000
committerGerald Combs <gerald@wireshark.org>2013-04-06 15:45:28 +0000
commit1cb1c73756ca967fe2ccb1f035db5dd02f6d380e (patch)
tree9c8025b9475139415a275713a4146bcf1d1daab7 /configure.ac
parent3217be744a97eec8aabac0d0b169bc4dfbc6f365 (diff)
Looks like the licensing change only applies to GnuTLS 3.1.10.
svn path=/trunk/; revision=48759
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 5a4dd389b1..e0268d4110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ AC_SYS_LARGEFILE
# GnuTLS
# Version 3.0 switched from LGPLv2.1+ to LGPLv3+, then switched back to
-# LGPLv2.1+ in versions 3.0.29 and 3.1.10
+# LGPLv2.1+ in version 3.1.10
tls_message="no"
AC_ARG_WITH([gnutls],
AC_HELP_STRING( [--with-gnutls=@<:@yes/no@:>@],
@@ -205,12 +205,6 @@ if test "x$with_gnutls" = "xyes"; then
)
if test "x$have_license_compatible_gnutls" != "xyes"; then
- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.29 gnutls < 3.1 ],
- [ have_license_compatible_gnutls="yes" ], [ echo "GnuTLS >= 3.0.29 not found " ]
- )
- fi
-
- if test "x$have_license_compatible_gnutls" != "xyes"; then
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
[ have_license_compatible_gnutls="yes" ] , [ echo "GnuTLS >= 1.2.0, < 3.0 not found " ]
)