Commit c39e2291 authored by Brendan Shanks's avatar Brendan Shanks Committed by Alexandre Julliard

configure: Remove Security.framework check (always present on macOS).

parent 6706784c
...@@ -746,8 +746,8 @@ OBJCFLAGS ...@@ -746,8 +746,8 @@ OBJCFLAGS
OBJC OBJC
OPENCL_LIBS OPENCL_LIBS
COREAUDIO_LIBS COREAUDIO_LIBS
SECURITY_LIBS
SYSTEMCONFIGURATION_LIBS SYSTEMCONFIGURATION_LIBS
SECURITY_LIBS
APPKIT_LIBS APPKIT_LIBS
CORESERVICES_LIBS CORESERVICES_LIBS
APPLICATIONSERVICES_LIBS APPLICATIONSERVICES_LIBS
...@@ -7829,12 +7829,6 @@ then : ...@@ -7829,12 +7829,6 @@ then :
printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h
fi fi
ac_fn_c_check_header_compile "$LINENO" "Security/Security.h" "ac_cv_header_Security_Security_h" "$ac_includes_default"
if test "x$ac_cv_header_Security_Security_h" = xyes
then :
printf "%s\n" "#define HAVE_SECURITY_SECURITY_H 1" >>confdefs.h
fi
ac_fn_c_check_header_compile "$LINENO" "SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h" "ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h" "ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" "$ac_includes_default"
if test "x$ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" = xyes if test "x$ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" = xyes
then : then :
...@@ -9466,6 +9460,8 @@ fi ;; ...@@ -9466,6 +9460,8 @@ fi ;;
APPKIT_LIBS="-framework AppKit" APPKIT_LIBS="-framework AppKit"
SECURITY_LIBS="-framework Security -framework CoreFoundation"
SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration" SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration"
...@@ -9597,11 +9593,6 @@ fi ...@@ -9597,11 +9593,6 @@ fi
as_fn_append wine_warnings "|can't build Wine preloader; many programs won't work" as_fn_append wine_warnings "|can't build Wine preloader; many programs won't work"
fi fi
if test "$ac_cv_header_Security_Security_h" = "yes"
then
SECURITY_LIBS="-framework Security -framework CoreFoundation"
fi
if test "x$with_coreaudio" != "xno"; if test "x$with_coreaudio" != "xno";
then then
COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI" COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
...@@ -23160,8 +23151,8 @@ METAL_LIBS = $METAL_LIBS ...@@ -23160,8 +23151,8 @@ METAL_LIBS = $METAL_LIBS
APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS
CORESERVICES_LIBS = $CORESERVICES_LIBS CORESERVICES_LIBS = $CORESERVICES_LIBS
APPKIT_LIBS = $APPKIT_LIBS APPKIT_LIBS = $APPKIT_LIBS
SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS
SECURITY_LIBS = $SECURITY_LIBS SECURITY_LIBS = $SECURITY_LIBS
SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS
COREAUDIO_LIBS = $COREAUDIO_LIBS COREAUDIO_LIBS = $COREAUDIO_LIBS
OPENCL_LIBS = $OPENCL_LIBS OPENCL_LIBS = $OPENCL_LIBS
OBJC = $OBJC OBJC = $OBJC
......
...@@ -409,7 +409,6 @@ AC_CHECK_HEADERS(\ ...@@ -409,7 +409,6 @@ AC_CHECK_HEADERS(\
CL/cl.h \ CL/cl.h \
EGL/egl.h \ EGL/egl.h \
OpenCL/opencl.h \ OpenCL/opencl.h \
Security/Security.h \
SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \
SystemConfiguration/SCNetworkConfiguration.h \ SystemConfiguration/SCNetworkConfiguration.h \
arpa/inet.h \ arpa/inet.h \
...@@ -682,6 +681,7 @@ case $host_os in ...@@ -682,6 +681,7 @@ case $host_os in
AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices")
AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices")
AC_SUBST(APPKIT_LIBS,"-framework AppKit") AC_SUBST(APPKIT_LIBS,"-framework AppKit")
AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation")
AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration")
WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" 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 ...@@ -706,10 +706,6 @@ case $host_os in
WINE_WARNING([can't build Wine preloader; many programs won't work]) WINE_WARNING([can't build Wine preloader; many programs won't work])
fi 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"; if test "x$with_coreaudio" != "xno";
then then
AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI")
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_SECURITY_SECURITY_H #ifdef __APPLE__
#include <Security/Security.h> #include <Security/Security.h>
#endif #endif
#ifdef SONAME_LIBGNUTLS #ifdef SONAME_LIBGNUTLS
...@@ -625,7 +625,7 @@ static void load_root_certs(void) ...@@ -625,7 +625,7 @@ static void load_root_certs(void)
{ {
unsigned int i; unsigned int i;
#ifdef HAVE_SECURITY_SECURITY_H #ifdef __APPLE__
const SecTrustSettingsDomain domains[] = { const SecTrustSettingsDomain domains[] = {
kSecTrustSettingsDomainSystem, kSecTrustSettingsDomainSystem,
kSecTrustSettingsDomainAdmin, kSecTrustSettingsDomainAdmin,
......
...@@ -366,9 +366,6 @@ ...@@ -366,9 +366,6 @@
/* Define to 1 if you have the <SDL.h> header file. */ /* Define to 1 if you have the <SDL.h> header file. */
#undef HAVE_SDL_H #undef HAVE_SDL_H
/* Define to 1 if you have the <Security/Security.h> header file. */
#undef HAVE_SECURITY_SECURITY_H
/* Define to 1 if you have the `setproctitle' function. */ /* Define to 1 if you have the `setproctitle' function. */
#undef HAVE_SETPROCTITLE #undef HAVE_SETPROCTITLE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment