diff options
| author | Andres Gomez <agomez@igalia.com> | 2013-04-11 10:32:54 +0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-13 10:49:46 +0000 |
| commit | 48d49759a4d43b5e5dd997b4a87555ce25ae2a04 (patch) | |
| tree | 738b34263b3c6c71a9cff99b60035b46dbf4a07d /neon/configs | |
| parent | f3f9db6d1d1fe63a4323f43de91a13aae03b1228 (diff) | |
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 <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'neon/configs')
| -rw-r--r-- | neon/configs/config.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/neon/configs/config.h b/neon/configs/config.h index db68aa289ac8..b0fdf22559e3 100644 --- a/neon/configs/config.h +++ b/neon/configs/config.h @@ -79,23 +79,25 @@ #define HAVE_GETSOCKOPT 1 #endif +#ifdef DISABLE_OPENSSL /* Define if GnuTLS support is enabled */ -/* #undef HAVE_GNUTLS */ +#define HAVE_GNUTLS /* Define to 1 if you have the `gnutls_certificate_get_x509_cas' function. */ /* #undef HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS */ /* Define to 1 if you have the `gnutls_certificate_verify_peers2' function. */ -/* #undef HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS2 */ +#define HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS2 /* Define to 1 if you have the `gnutls_session_get_data2' function. */ -/* #undef HAVE_GNUTLS_SESSION_GET_DATA2 */ +#define HAVE_GNUTLS_SESSION_GET_DATA2 /* Define to 1 if you have the `gnutls_sign_callback_set' function. */ -/* #undef HAVE_GNUTLS_SIGN_CALLBACK_SET */ +#define HAVE_GNUTLS_SIGN_CALLBACK_SET /* Define to 1 if you have the `gnutls_x509_dn_get_rdn_ava' function. */ -/* #undef HAVE_GNUTLS_X509_DN_GET_RDN_AVA */ +#define HAVE_GNUTLS_X509_DN_GET_RDN_AVA +#endif /* DISABLE_OPENSSL */ /* Define if GSSAPI support is enabled */ /* #undef HAVE_GSSAPI */ @@ -179,6 +181,7 @@ #define HAVE_NETINET_TCP_H 1 #endif +#ifndef DISABLE_OPENSSL /* Define if NTLM is supported */ #ifndef WIN32 #define HAVE_NTLM 1 @@ -192,6 +195,7 @@ /* Define to 1 if you have the <openssl/ssl.h> header file. */ #define HAVE_OPENSSL_SSL_H 1 +#endif /* !DISABLE_OPENSSL */ /* Define if pakchois library supported */ /* #undef HAVE_PAKCHOIS */ |