Module: wine Branch: master Commit: 8b415f8bb516b6a772025702eb6427b196f20f2e URL: https://gitlab.winehq.org/wine/wine/-/commit/8b415f8bb516b6a772025702eb6427b...
Author: Brendan Shanks bshanks@codeweavers.com Date: Tue Nov 22 13:54:03 2022 -0800
configure: Remove CoreAudio.h check (always present on macOS).
---
configure | 10 ++-------- configure.ac | 6 ++---- include/config.h.in | 3 --- 3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/configure b/configure index 04dca04127f..2574923cc01 100755 --- a/configure +++ b/configure @@ -4189,7 +4189,7 @@ fi # Check whether --with-coreaudio was given. if test ${with_coreaudio+y} then : - withval=$with_coreaudio; if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi + withval=$with_coreaudio; fi
@@ -7849,12 +7849,6 @@ if test "x$ac_cv_header_CL_cl_h" = xyes then : printf "%s\n" "#define HAVE_CL_CL_H 1" >>confdefs.h
-fi -ac_fn_c_check_header_compile "$LINENO" "CoreAudio/CoreAudio.h" "ac_cv_header_CoreAudio_CoreAudio_h" "$ac_includes_default" -if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = xyes -then : - printf "%s\n" "#define HAVE_COREAUDIO_COREAUDIO_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 @@ -9949,7 +9943,7 @@ fi SECURITY_LIBS="-framework Security -framework CoreFoundation"
fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" + if test "x$with_coreaudio" != "xno"; then COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
diff --git a/configure.ac b/configure.ac index 505f1d9afa5..56743a14e0d 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,7 @@ AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[treat compilation warnin
AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) -AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]), - [if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi]) +AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support])) AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) @@ -408,7 +407,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ CL/cl.h \ - CoreAudio/CoreAudio.h \ DiskArbitration/DiskArbitration.h \ EGL/egl.h \ IOKit/IOKitLib.h \ @@ -721,7 +719,7 @@ case $host_os in then AC_SUBST(SECURITY_LIBS,"-framework Security -framework CoreFoundation") fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" + if test "x$with_coreaudio" != "xno"; then AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} diff --git a/include/config.h.in b/include/config.h.in index b880b8c0899..e2b123e9049 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -30,9 +30,6 @@ /* Define to 1 if you have the <CL/cl.h> header file. */ #undef HAVE_CL_CL_H
-/* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ -#undef HAVE_COREAUDIO_COREAUDIO_H - /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H