From 48d49759a4d43b5e5dd997b4a87555ce25ae2a04 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Thu, 11 Apr 2013 10:32:54 +0300 Subject: neon: honor --disable-openssl and use GNUTLS On --disable-openssl, the bundled neon library will link against GNUTLS + gcrypt instead of OpenSSL. Change-Id: I5b3f09cd1003aefde0478aaab026536c962212c4 Reviewed-on: https://gerrit.libreoffice.org/3330 Reviewed-by: David Tardon Tested-by: David Tardon --- configure.ac | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 75e149f923fd..da58c8969fe5 100644 --- a/configure.ac +++ b/configure.ac @@ -8579,6 +8579,21 @@ fi AC_SUBST([DISABLE_OPENSSL]) +dnl =================================================================== +dnl Check for building gnutls +dnl =================================================================== +AC_MSG_CHECKING([whether to use gnutls]) +if test "$enable_neon" != "no" && test "$enable_openssl" = "no"; then + AC_MSG_RESULT([yes]) + AM_PATH_LIBGCRYPT() + PKG_CHECK_MODULES(GNUTLS, [gnutls],, + AC_MSG_ERROR([Disabling OpenSSL was requested, but GNUTLS is not + available in the system to use as replacement.])) +fi + +AC_SUBST([LIBGCRYPT_CFLAGS]) +AC_SUBST([LIBGCRYPT_LIBS]) + dnl =================================================================== dnl Check for system redland dnl =================================================================== -- cgit