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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c39e229163b1f18f406d64fdc793b410216a485c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c39e229163b1f18f406d64fdc793b41...

Author: Brendan Shanks 
Date:   Tue Nov 22 13:48:10 2022 -0800

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

---

configure              | 17 ++++-------------
 configure.ac           |  6 +-----
 dlls/crypt32/unixlib.c |  4 ++--
 include/config.h.in    |  3 ---
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/configure b/configure
index 743940a343b..1a8af17a627 100755
--- a/configure
+++ b/configure
@@ -746,8 +746,8 @@ OBJCFLAGS
 OBJC
 OPENCL_LIBS
 COREAUDIO_LIBS
-SECURITY_LIBS
 SYSTEMCONFIGURATION_LIBS
+SECURITY_LIBS
 APPKIT_LIBS
 CORESERVICES_LIBS
 APPLICATIONSERVICES_LIBS
@@ -7828,12 +7828,6 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes
 then :
   printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h

-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"
 if test "x$ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" = xyes
@@ -9466,6 +9460,8 @@ fi ;;

APPKIT_LIBS="-framework AppKit"

+    SECURITY_LIBS="-framework Security -framework CoreFoundation"
+
     SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration"

@@ -9597,11 +9593,6 @@ fi
         as_fn_append wine_warnings "|can't build Wine preloader; many programs won't work"
     fi

-    if test "$ac_cv_header_Security_Security_h" = "yes"
-    then
-        SECURITY_LIBS="-framework Security -framework CoreFoundation"
-
-    fi
     if test "x$with_coreaudio" != "xno";
     then
         COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
@@ -23160,8 +23151,8 @@ METAL_LIBS = $METAL_LIBS
 APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS
 CORESERVICES_LIBS = $CORESERVICES_LIBS
 APPKIT_LIBS = $APPKIT_LIBS
-SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS
 SECURITY_LIBS = $SECURITY_LIBS
+SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS
 COREAUDIO_LIBS = $COREAUDIO_LIBS
 OPENCL_LIBS = $OPENCL_LIBS
 OBJC = $OBJC
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,
diff --git a/include/config.h.in b/include/config.h.in
index 35f0cf84463..146d0b7075c 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -366,9 +366,6 @@
 /* Define to 1 if you have the <SDL.h> header file. */
 #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. */
 #undef HAVE_SETPROCTITLE