From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 11 Oct 2013 18:29:18 +0000 (-0400)
Subject: * configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1284^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5fc0178115815bb94b4b26da8e5326931dd9cff;p=emacs.git

* configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty
string when gnutls2 is installed but gnutls3 is not.
---

diff --git a/ChangeLog b/ChangeLog
index bb16aea8cc7..66eefd2d445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty
+	string when gnutls2 is installed but gnutls3 is not.
+
 2013-10-11  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* configure.ac: Define HAVE_GNUTLS3 if GnuTLS v3 is found.
diff --git a/configure.ac b/configure.ac
index fd0c2d9b92c..40da4af157e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2424,14 +2424,15 @@ AC_SUBST(LIBSELINUX_LIBS)
 HAVE_GNUTLS=no
 HAVE_GNUTLS3=no
 if test "${with_gnutls}" = "yes" ; then
-  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0], HAVE_GNUTLS3=yes, HAVE_GNUTLS3=no)
-  if test "${HAVE_GNUTLS}" = "yes"; then
-    AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
-  fi
-
   if test "${HAVE_GNUTLS3}" = "yes"; then
     AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])
+    HAVE_GNUTLS="yes"
+  else
+    PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
+  fi
+  if test "${HAVE_GNUTLS}" = "yes"; then
+    AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
   fi
 
   # Windows loads GnuTLS dynamically