From 7847ce2304f0938975c30fc1def557d0ae440d79 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Tue, 13 Dec 2016 15:03:24 +0100
Subject: [PATCH] Fix AVKit availability check for OS X SDK 10.7 and 10.8

This fixes the check for older SDKs and outputs the check result.

(cherry picked from commit 159186d656f711bb1059dc3b74370d03bbc8d24c)

Closes https://github.com/wxWidgets/wxWidgets/pull/371
---
 configure    | 12 ++++++++----
 configure.in |  7 ++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 4ca3dd52c0..62895151ea 100755
--- a/configure
+++ b/configure
@@ -38080,8 +38080,8 @@ fi
 
             fi
             if test "$wxOSX_USE_QTKIT" = "no"; then
-                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AVKit is availble" >&5
-$as_echo_n "checking if AVKit is availble... " >&6; }
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AVKit is available" >&5
+$as_echo_n "checking if AVKit is available... " >&6; }
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "AvailabilityMacros.h"
@@ -38089,7 +38089,7 @@ int
 main ()
 {
 
-                        #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
+                        #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
                             // AVKit available
                         #else
                             choke me
@@ -38100,7 +38100,11 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  GST_LIBS="$GST_LIBS -framework AVKit"
+  GST_LIBS="$GST_LIBS -framework AVKit"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
diff --git a/configure.in b/configure.in
index 01c8ee8e2f..41eab41f04 100644
--- a/configure.in
+++ b/configure.in
@@ -7649,17 +7649,18 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
             fi
             if test "$wxOSX_USE_QTKIT" = "no"; then
                 dnl AVKit is only available since OS X 10.9
-                AC_MSG_CHECKING([if AVKit is availble])
+                AC_MSG_CHECKING([if AVKit is available])
                 AC_TRY_COMPILE(
                     [#include "AvailabilityMacros.h"],
                     [
-                        #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
+                        #if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
                             // AVKit available
                         #else
                             choke me
                         #endif
                     ],
-                    GST_LIBS="$GST_LIBS -framework AVKit"
+                    [GST_LIBS="$GST_LIBS -framework AVKit"; AC_MSG_RESULT(yes)],
+                    AC_MSG_RESULT(no)
                 )
             fi
             CPPFLAGS="$old_CPPFLAGS"