[PATCH 05/11] configure: Remove DiskArbitration.framework check (always present on macOS).

[Brendan Shanks]

From: Brendan Shanks

---
 configure.ac                | 15 ++++++---------
 dlls/mountmgr.sys/diskarb.c |  8 ++++----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 56743a14e0d..a80310fee3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -407,7 +407,6 @@ AC_SYS_LARGEFILE()
 AC_CHECK_HEADERS(\
    AL/al.h \
    CL/cl.h \
-	DiskArbitration/DiskArbitration.h \
    EGL/egl.h \
    IOKit/IOKitLib.h \
    IOKit/hid/IOHIDLib.h \
@@ -682,6 +681,7 @@ case $host_os in
     dnl declare needed frameworks
     AC_SUBST(CARBON_LIBS,"-framework Carbon")
     AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation")
+    AC_SUBST(DISKARBITRATION_LIBS,"-framework DiskArbitration -framework CoreFoundation")
     AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation")
     AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices")
     AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices")
@@ -710,11 +710,6 @@ case $host_os in
         WINE_WARNING([can't build Wine preloader; many programs won't work])
     fi

-    if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
-    then
-        dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
-        AC_SUBST(DISKARBITRATION_LIBS,"-framework DiskArbitration -framework CoreFoundation")
-    fi
     if test "$ac_cv_header_Security_Security_h" = "yes"
     then
         AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation")
@@ -1428,9 +1423,11 @@ then
             [WINE_CHECK_SONAME(dbus-1, dbus_connection_close,,[DBUS_CFLAGS=""],[$DBUS_LIBS])],
             [DBUS_CFLAGS=""])])
 fi
-WINE_NOTICE_WITH(dbus,[test "x$ac_cv_lib_soname_dbus_1" = "x" -a \
-                            "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"],
-                 [libdbus ${notice_platform}development files not found, no dynamic device support.])
+case $host_os in
+  darwin*|macosx*) ;;
+  *) WINE_NOTICE_WITH(dbus,[test "x$ac_cv_lib_soname_dbus_1" = "x"],
+                      [libdbus ${notice_platform}development files not found, no dynamic device support.]) ;;
+esac

dnl **** Check for libgnutls ****
 if test "x$with_gnutls" != "xno"
diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c
index 4bcd72c8916..18d4b65a625 100644
--- a/dlls/mountmgr.sys/diskarb.c
+++ b/dlls/mountmgr.sys/diskarb.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H
+#ifdef __APPLE__
 #include <DiskArbitration/DiskArbitration.h>
 #endif
 #if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)
@@ -50,7 +50,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);

-#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H
+#ifdef __APPLE__

typedef struct
 {
@@ -218,14 +218,14 @@ void run_diskarbitration_loop(void)
     CFRelease( session );
 }

-#else  /*  HAVE_DISKARBITRATION_DISKARBITRATION_H */
+#else  /* __APPLE__ */

void run_diskarbitration_loop(void)
 {
     TRACE( "Skipping, Disk Arbitration support not compiled in\n" );
 }

-#endif  /* HAVE_DISKARBITRATION_DISKARBITRATION_H */
+#endif  /* __APPLE__ */

#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H)