* 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 bb16aea8cc713e06944247115f6b8ae5b8f9a7d5..66eefd2d445b2cda8fce98873b7e96b431468a41 100644 (file)
--- 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 fd0c2d9b92c5f70576a2caf2cff07d87fda32f46..40da4af157e2a464625f1ed4a423e8bec6c86478 100644 (file)
--- 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