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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 45db3481f4d9ef7290eab9c2d29e5e3904cd16ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=45db3481f4d9ef7290eab9c2d2...

Author: Alexandre Julliard 
Date:   Mon Mar 14 14:25:45 2011 +0100

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

---

configure                |   12 ++++++++----
 configure.ac             |    6 +++++-
 dlls/crypt32/rootstore.c |    4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 3651711..8790041 100755
--- a/configure
+++ b/configure
@@ -657,12 +657,12 @@ QUICKTIMELIB
 LIBOPENCL
 FRAMEWORK_OPENAL
 COREAUDIO
+SECURITYLIB
 DISKARBITRATIONLIB
 LDEXECFLAGS
 APPLICATIONSERVICESLIB
 IOKITLIB
 COREFOUNDATIONLIB
-SECURITYLIB
 DLLWRAP
 DLLTOOL
 LDD
@@ -6519,9 +6519,7 @@ fi
     LDSHARED="$(CC) -dynamiclib"
     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) $@"
-        SECURITYLIB="-framework Security -framework CoreFoundation"
-
-    COREFOUNDATIONLIB="-framework CoreFoundation"
+        COREFOUNDATIONLIB="-framework CoreFoundation"

IOKITLIB="-framework IOKit -framework CoreFoundation"

@@ -6534,6 +6532,12 @@ fi
                 DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation"

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"
     then
         if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"
diff --git a/configure.ac b/configure.ac
index 8314579..b16b9e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -703,7 +703,6 @@ case $host_os in
     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) $@"
     dnl declare needed frameworks
-    AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
     AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
     AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
     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
         AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation")
     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"
     then
         if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes"
diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c
index 506497a..c6f106e 100644
--- a/dlls/crypt32/rootstore.c
+++ b/dlls/crypt32/rootstore.c
@@ -40,7 +40,7 @@
 #include "winternl.h"
 #include "wine/debug.h"
 #include "crypt32_private.h"
-#ifdef __APPLE__
+#ifdef HAVE_SECURITY_SECURITY_H
 #include <Security/Security.h>
 #endif

@@ -746,7 +746,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store)
         DWORD i;
         BOOL ret = FALSE;

-#ifdef __APPLE__
+#ifdef HAVE_SECURITY_SECURITY_H
         OSStatus status;
         CFArrayRef rootCerts;