From 1cb1c73756ca967fe2ccb1f035db5dd02f6d380e Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sat, 6 Apr 2013 15:45:28 +0000
Subject: Looks like the licensing change only applies to GnuTLS 3.1.10.

svn path=/trunk/; revision=48759
---
 configure.ac | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'configure.ac')

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@:>@],
@@ -204,12 +204,6 @@ if test "x$with_gnutls" = "xyes"; then
     [ have_license_compatible_gnutls="yes" ], [ echo "GnuTLS >= 3.1.10 not found " ]
   )
 
-  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 " ]
-- 
cgit v1.2.3