[Emacs-diffs] trunk r114631: * configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty

[Stefan Monnier]

------------------------------------------------------------
revno: 114631
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-11 14:29:18 -0400
message:
  * configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty
  string when gnutls2 is installed but gnutls3 is not.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-10-11 13:47:35 +0000
+++ b/ChangeLog 2013-10-11 18:29:18 +0000
@@ -1,3 +1,8 @@
+2013-10-11  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * configure.ac: Define HAVE_GNUTLS3 if GnuTLS v3 is found.

=== modified file 'configure.ac'
--- a/configure.ac      2013-10-11 13:47:35 +0000
+++ b/configure.ac      2013-10-11 18:29:18 +0000
@@ -2424,16 +2424,17 @@
 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_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
 
-  if test "${HAVE_GNUTLS3}" = "yes"; then
-    AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])
-  fi
-
   # Windows loads GnuTLS dynamically
   if test "${opsys}" = "mingw32"; then
     LIBGNUTLS_LIBS=