[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c592e7dea2e5ac326041b78b9512600c984ccced
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 8 13:22:44 2014 +0200

    libgcrypt and gnutls are only used by our internal external/neon
    
    ...so must not be checked for if --without-system-neon
    
    Change-Id: If598108f98d6f94f32650feba7044224a78a4c12

diff --git a/configure.ac b/configure.ac
index 35ed2b2..7da6486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9194,7 +9194,7 @@ dnl ===================================================================
 dnl Check for building gnutls
 dnl ===================================================================
 AC_MSG_CHECKING([whether to use gnutls])
-if test "$WITH_WEBDAV" = "neon" && test "$enable_openssl" = "no"; then
+if test "$WITH_WEBDAV" = "neon" -a "$with_system_neon" = no -a "$enable_openssl" = "no"; then
     AC_MSG_RESULT([yes])
     AM_PATH_LIBGCRYPT()
     PKG_CHECK_MODULES(GNUTLS, [gnutls],,