7881a6d
From 3cfc0933c38a9f5383042347ef659c3d982090a3 Mon Sep 17 00:00:00 2001
7881a6d
From: Stephan Bergmann <sbergman@redhat.com>
7881a6d
Date: Wed, 8 Oct 2014 13:22:44 +0200
7881a6d
Subject: [PATCH] libgcrypt and gnutls are only used by our internal
7881a6d
 external/neon
7881a6d
7881a6d
...so must not be checked for if --without-system-neon
7881a6d
7881a6d
Change-Id: If598108f98d6f94f32650feba7044224a78a4c12
7881a6d
(cherry picked from commit c592e7dea2e5ac326041b78b9512600c984ccced)
7881a6d
---
7881a6d
 configure.ac | 2 +-
7881a6d
 1 file changed, 1 insertion(+), 1 deletion(-)
7881a6d
7881a6d
diff --git a/configure.ac b/configure.ac
7881a6d
index 363eb2f..ed3da6c 100644
7881a6d
--- a/configure.ac
7881a6d
+++ b/configure.ac
7881a6d
@@ -9463,7 +9463,7 @@ dnl ===================================================================
7881a6d
 dnl Check for building gnutls
7881a6d
 dnl ===================================================================
7881a6d
 AC_MSG_CHECKING([whether to use gnutls])
7881a6d
-if test "$WITH_WEBDAV" = "neon" && test "$enable_openssl" = "no"; then
7881a6d
+if test "$WITH_WEBDAV" = "neon" -a "$with_system_neon" = no -a "$enable_openssl" = "no"; then
7881a6d
     AC_MSG_RESULT([yes])
7881a6d
     AM_PATH_LIBGCRYPT()
7881a6d
     PKG_CHECK_MODULES(GNUTLS, [gnutls],,
7881a6d
-- 
7881a6d
1.9.3
7881a6d