Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
c8f9ee0b
Commit
c8f9ee0b
authored
Nov 09, 2022
by
Brendan Shanks
Committed by
Alexandre Julliard
Dec 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Remove DiskArbitration.framework check (always present on macOS).
parent
8b415f8b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
33 deletions
+19
-33
configure
configure
+9
-16
configure.ac
configure.ac
+6
-9
diskarb.c
dlls/mountmgr.sys/diskarb.c
+4
-4
config.h.in
include/config.h.in
+0
-4
No files found.
configure
View file @
c8f9ee0b
...
...
@@ -745,12 +745,12 @@ METAL_LIBS
OPENCL_LIBS
COREAUDIO_LIBS
SECURITY_LIBS
DISKARBITRATION_LIBS
SYSTEMCONFIGURATION_LIBS
APPKIT_LIBS
CORESERVICES_LIBS
APPLICATIONSERVICES_LIBS
IOKIT_LIBS
DISKARBITRATION_LIBS
COREFOUNDATION_LIBS
CARBON_LIBS
ac_ct_OBJC
...
...
@@ -7850,12 +7850,6 @@ then :
printf
"%s
\n
"
"#define HAVE_CL_CL_H 1"
>>
confdefs.h
fi
ac_fn_c_check_header_compile
"
$LINENO
"
"DiskArbitration/DiskArbitration.h"
"ac_cv_header_DiskArbitration_DiskArbitration_h"
"
$ac_includes_default
"
if
test
"x
$ac_cv_header_DiskArbitration_DiskArbitration_h
"
=
xyes
then
:
printf
"%s
\n
"
"#define HAVE_DISKARBITRATION_DISKARBITRATION_H 1"
>>
confdefs.h
fi
ac_fn_c_check_header_compile
"
$LINENO
"
"EGL/egl.h"
"ac_cv_header_EGL_egl_h"
"
$ac_includes_default
"
if
test
"x
$ac_cv_header_EGL_egl_h
"
=
xyes
then
:
...
...
@@ -9794,6 +9788,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
COREFOUNDATION_LIBS
=
"-framework CoreFoundation"
DISKARBITRATION_LIBS
=
"-framework DiskArbitration -framework CoreFoundation"
IOKIT_LIBS
=
"-framework IOKit -framework CoreFoundation"
APPLICATIONSERVICES_LIBS
=
"-framework ApplicationServices"
...
...
@@ -9933,11 +9929,6 @@ fi
as_fn_append wine_warnings
"|can't build Wine preloader; many programs won't work"
fi
if
test
"
$ac_cv_header_DiskArbitration_DiskArbitration_h
"
=
"yes"
then
DISKARBITRATION_LIBS
=
"-framework DiskArbitration -framework CoreFoundation"
fi
if
test
"
$ac_cv_header_Security_Security_h
"
=
"yes"
then
SECURITY_LIBS
=
"-framework Security -framework CoreFoundation"
...
...
@@ -16124,8 +16115,9 @@ fi
CPPFLAGS
=
$ac_save_CPPFLAGS
fi
if
test
"x
$ac_cv_lib_soname_dbus_1
"
=
"x"
-a
\
"x
$ac_cv_header_DiskArbitration_DiskArbitration_h
"
!=
"xyes"
case
$host_os
in
darwin
*
|
macosx
*
)
;;
*
)
if
test
"x
$ac_cv_lib_soname_dbus_1
"
=
"x"
then
:
case
"x
$with_dbus
"
in
x
)
as_fn_append wine_notices
"|libdbus
${
notice_platform
}
development files not found, no dynamic device support."
;;
...
...
@@ -16134,7 +16126,8 @@ then :
This is an error since --with-dbus was requested."
"
$LINENO
"
5
;;
esac
fi
fi
;;
esac
if
test
"x
$with_gnutls
"
!=
"xno"
then
...
...
@@ -23248,12 +23241,12 @@ OBJCFLAGS = $OBJCFLAGS
ac_ct_OBJC =
$ac_ct_OBJC
CARBON_LIBS =
$CARBON_LIBS
COREFOUNDATION_LIBS =
$COREFOUNDATION_LIBS
DISKARBITRATION_LIBS =
$DISKARBITRATION_LIBS
IOKIT_LIBS =
$IOKIT_LIBS
APPLICATIONSERVICES_LIBS =
$APPLICATIONSERVICES_LIBS
CORESERVICES_LIBS =
$CORESERVICES_LIBS
APPKIT_LIBS =
$APPKIT_LIBS
SYSTEMCONFIGURATION_LIBS =
$SYSTEMCONFIGURATION_LIBS
DISKARBITRATION_LIBS =
$DISKARBITRATION_LIBS
SECURITY_LIBS =
$SECURITY_LIBS
COREAUDIO_LIBS =
$COREAUDIO_LIBS
OPENCL_LIBS =
$OPENCL_LIBS
...
...
configure.ac
View file @
c8f9ee0b
...
...
@@ -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"
...
...
dlls/mountmgr.sys/diskarb.c
View file @
c8f9ee0b
...
...
@@ -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)
...
...
include/config.h.in
View file @
c8f9ee0b
...
...
@@ -36,10 +36,6 @@
/* Define to 1 if you have the <cups/ppd.h> header file. */
#undef HAVE_CUPS_PPD_H
/* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header
file. */
#undef HAVE_DISKARBITRATION_DISKARBITRATION_H
/* Define to 1 if you have the `dlinfo' function. */
#undef HAVE_DLINFO
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment