marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Improve check for security framework and don't warn about gnutls in that case.

oldstable
Alexandre Julliard 2011-03-14 14:25:45 +01:00
parent 5015f388d1
commit 45db3481f4
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -657,12 +657,12 @@ QUICKTIMELIB
LIBOPENCL LIBOPENCL
FRAMEWORK_OPENAL FRAMEWORK_OPENAL
COREAUDIO COREAUDIO
SECURITYLIB
DISKARBITRATIONLIB DISKARBITRATIONLIB
LDEXECFLAGS LDEXECFLAGS
APPLICATIONSERVICESLIB APPLICATIONSERVICESLIB
IOKITLIB IOKITLIB
COREFOUNDATIONLIB COREFOUNDATIONLIB
SECURITYLIB
DLLWRAP DLLWRAP
DLLTOOL DLLTOOL
LDD LDD
@ -6519,9 +6519,7 @@ fi
LDSHARED="\$(CC) -dynamiclib" LDSHARED="\$(CC) -dynamiclib"
STRIP="$STRIP -x" STRIP="$STRIP -x"
LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
SECURITYLIB="-framework Security -framework CoreFoundation" COREFOUNDATIONLIB="-framework CoreFoundation"
COREFOUNDATIONLIB="-framework CoreFoundation"
IOKITLIB="-framework IOKit -framework CoreFoundation" IOKITLIB="-framework IOKit -framework CoreFoundation"
@ -6534,6 +6532,12 @@ fi
DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation" DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation"
fi fi
if test "$ac_cv_header_Security_Security_h" = "yes"
then
SECURITYLIB="-framework Security -framework CoreFoundation"
with_gnutls=${with_gnutls:-no}
fi
if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
then then
if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"

6
configure.ac
View File

@ -703,7 +703,6 @@ case $host_os in
STRIP="$STRIP -x" STRIP="$STRIP -x"
LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
dnl declare needed frameworks dnl declare needed frameworks
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices")
@ -713,6 +712,11 @@ case $host_os in
dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation") AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation")
fi fi
if test "$ac_cv_header_Security_Security_h" = "yes"
then
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
with_gnutls=${with_gnutls:-no}
fi
if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
then then
if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"

4
dlls/crypt32/rootstore.c
View File

@ -40,7 +40,7 @@
#include "winternl.h" #include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "crypt32_private.h" #include "crypt32_private.h"
#ifdef __APPLE__ #ifdef HAVE_SECURITY_SECURITY_H
#include <Security/Security.h> #include <Security/Security.h>
#endif #endif
@ -746,7 +746,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store)
DWORD i; DWORD i;
BOOL ret = FALSE; BOOL ret = FALSE;
#ifdef __APPLE__ #ifdef HAVE_SECURITY_SECURITY_H
OSStatus status; OSStatus status;
CFArrayRef rootCerts; CFArrayRef rootCerts;