Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
c39e2291
Commit
c39e2291
authored
Nov 22, 2022
by
Brendan Shanks
Committed by
Alexandre Julliard
Dec 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Remove Security.framework check (always present on macOS).
parent
6706784c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
23 deletions
+7
-23
configure
configure
+4
-13
configure.ac
configure.ac
+1
-5
unixlib.c
dlls/crypt32/unixlib.c
+2
-2
config.h.in
include/config.h.in
+0
-3
No files found.
configure
View file @
c39e2291
...
...
@@ -746,8 +746,8 @@ OBJCFLAGS
OBJC
OPENCL_LIBS
COREAUDIO_LIBS
SECURITY_LIBS
SYSTEMCONFIGURATION_LIBS
SECURITY_LIBS
APPKIT_LIBS
CORESERVICES_LIBS
APPLICATIONSERVICES_LIBS
...
...
@@ -7829,12 +7829,6 @@ 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
then
:
...
...
@@ -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
...
...
configure.ac
View file @
c39e2291
...
...
@@ -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")
...
...
dlls/crypt32/unixlib.c
View file @
c39e2291
...
...
@@ -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
,
...
...
include/config.h.in
View file @
c39e2291
...
...
@@ -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
...
...
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