secur32: Default to building with GnuTLS support on macOS, if present.
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 4940d2ada2
)
Conflicts:
dlls/secur32/schannel_gnutls.c
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
parent
e2e053ea57
commit
4a0a4d150d
|
@ -42,7 +42,7 @@
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
|
||||||
#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H)
|
#if defined(SONAME_LIBGNUTLS)
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(secur32);
|
WINE_DEFAULT_DEBUG_CHANNEL(secur32);
|
||||||
WINE_DECLARE_DEBUG_CHANNEL(winediag);
|
WINE_DECLARE_DEBUG_CHANNEL(winediag);
|
||||||
|
@ -1098,4 +1098,4 @@ void schan_imp_deinit(void)
|
||||||
libgnutls_handle = NULL;
|
libgnutls_handle = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */
|
#endif /* SONAME_LIBGNUTLS */
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include "secur32_priv.h"
|
#include "secur32_priv.h"
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
|
||||||
#ifdef HAVE_SECURITY_SECURITY_H
|
#if defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS)
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(secur32);
|
WINE_DEFAULT_DEBUG_CHANNEL(secur32);
|
||||||
|
|
||||||
|
@ -1242,4 +1242,4 @@ void schan_imp_deinit(void)
|
||||||
TRACE("()\n");
|
TRACE("()\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* HAVE_SECURITY_SECURITY_H */
|
#endif /* HAVE_SECURITY_SECURITY_H && !SONAME_LIBGNUTLS */
|
||||||
|
|
Loading…
Reference in New Issue