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