From: Brendan Shanks bshanks@codeweavers.com
--- configure.ac | 6 +----- dlls/crypt32/unixlib.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac index cff8fba397a..836dd393517 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ - Security/Security.h \ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ SystemConfiguration/SCNetworkConfiguration.h \ arpa/inet.h \ @@ -682,6 +681,7 @@ case $host_os in AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") + AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration")
WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" @@ -706,10 +706,6 @@ case $host_os in WINE_WARNING([can't build Wine preloader; many programs won't work]) fi
- if test "$ac_cv_header_Security_Security_h" = "yes" - then - AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") - fi if test "x$with_coreaudio" != "xno"; then AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 9a36d12f293..e90642fb0d5 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -29,7 +29,7 @@ #include <unistd.h> #include <dlfcn.h> #include <sys/stat.h> -#ifdef HAVE_SECURITY_SECURITY_H +#ifdef __APPLE__ #include <Security/Security.h> #endif #ifdef SONAME_LIBGNUTLS @@ -625,7 +625,7 @@ static void load_root_certs(void) { unsigned int i;
-#ifdef HAVE_SECURITY_SECURITY_H +#ifdef __APPLE__ const SecTrustSettingsDomain domains[] = { kSecTrustSettingsDomainSystem, kSecTrustSettingsDomainAdmin,