* configure.ac: Simplify gnutls tests.

Ref: http://debbugs.gnu.org/19168#21

diff --git a/ChangeLog b/ChangeLog
index 6f8a0fad823f82d8dedfdb2aaea69e87bd273a96..9eae9e0a51173cb2046fbdbbbd4f5b9f89565ebc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-29  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac: Simplify gnutls tests.
+
 2014-11-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * .gitignore: Add entries for emacsvers files.

diff --git a/configure.ac b/configure.ac
index 70592d97e0d7737d4217655a61384c0abdb840c5..010abc8544cf86a8b67e1b630f8d7bc2788ec6f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2599,19 +2599,13 @@ fi
 AC_SUBST(LIBSELINUX_LIBS)
 
 HAVE_GNUTLS=no
-HAVE_GNUTLS3=no
 if test "${with_gnutls}" = "yes" ; then
-  EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0],
-    [HAVE_GNUTLS3=yes], [HAVE_GNUTLS3=no])
-  if test "${HAVE_GNUTLS3}" = "yes"; then
-    AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])
-    HAVE_GNUTLS="yes"
-  else
-    EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6],
-      [HAVE_GNUTLS=yes], [HAVE_GNUTLS=no])
-  fi
+  EMACS_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6],
+    [HAVE_GNUTLS=yes], [HAVE_GNUTLS=no])
   if test "${HAVE_GNUTLS}" = "yes"; then
     AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
+    EMACS_CHECK_MODULES([LIBGNUTLS3], [gnutls >= 3.0.0],
+      [AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])], [])
   fi
 
   # Windows loads GnuTLS dynamically