Brendan Shanks : configure: Remove SystemConfiguration header check (always present on macOS).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9207927d950ce8ab41a6d8c25cfa593ce770d5cf
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9207927d950ce8ab41a6d8c25cfa593...

Author: Brendan Shanks 
Date:   Thu Dec  1 10:10:18 2022 -0800

configure: Remove SystemConfiguration header check (always present on macOS).

---

configure                   | 12 ------------
 configure.ac                |  2 --
 dlls/mountmgr.sys/dbus.c    |  2 +-
 dlls/mountmgr.sys/diskarb.c |  4 +---
 include/config.h.in         |  8 --------
 5 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/configure b/configure
index 1a8af17a627..85a28e59928 100755
--- a/configure
+++ b/configure
@@ -7828,18 +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" "SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h" "ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_SystemConfiguration_SCDynamicStoreCopyDHCPInfo_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "SystemConfiguration/SCNetworkConfiguration.h" "ac_cv_header_SystemConfiguration_SCNetworkConfiguration_h" "$ac_includes_default"
-if test "x$ac_cv_header_SystemConfiguration_SCNetworkConfiguration_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H 1" >>confdefs.h
-
 fi
 ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
 if test "x$ac_cv_header_arpa_inet_h" = xyes
diff --git a/configure.ac b/configure.ac
index 836dd393517..b0988819b85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,8 +409,6 @@ AC_CHECK_HEADERS(\
    CL/cl.h \
    EGL/egl.h \
    OpenCL/opencl.h \
-	SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \
-	SystemConfiguration/SCNetworkConfiguration.h \
    arpa/inet.h \
    arpa/nameser.h \
    asm/types.h \
diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c
index cc115751a19..6fe6984c218 100644
--- a/dlls/mountmgr.sys/dbus.c
+++ b/dlls/mountmgr.sys/dbus.c
@@ -573,7 +573,7 @@ found:
     while (p_dbus_connection_read_write_dispatch( connection, -1 )) /* nothing */ ;
 }

-#if !defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) || !defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
+#if !defined(__APPLE__)

/* The udisks dispatch loop will block all threads using the same connection, so we'll
    use a private connection. Multiple threads can make methods calls at the same time
diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c
index 18d4b65a625..4817cfc61d6 100644
--- a/dlls/mountmgr.sys/diskarb.c
+++ b/dlls/mountmgr.sys/diskarb.c
@@ -33,8 +33,6 @@
 #include <sys/ioctl.h>
 #ifdef __APPLE__
 #include <DiskArbitration/DiskArbitration.h>
-#endif
-#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
 #include <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h>
 #include <SystemConfiguration/SCNetworkConfiguration.h>
 #endif
@@ -227,7 +225,7 @@ void run_diskarbitration_loop(void)

#endif  /* __APPLE__ */

-#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
+#if defined(__APPLE__)

static UInt8 map_option( unsigned int option )
 {
diff --git a/include/config.h.in b/include/config.h.in
index 146d0b7075c..781afd13066 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -501,14 +501,6 @@
 /* Define to 1 if you have the `sysinfo' function. */
 #undef HAVE_SYSINFO

-/* Define to 1 if you have the
-   <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */
-#undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H
-
-/* Define to 1 if you have the <SystemConfiguration/SCNetworkConfiguration.h>
-   header file. */
-#undef HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H
-
 /* Define to 1 if you have the <sys/attr.h> header file. */
 #undef HAVE_SYS_ATTR_H