From fa525d61997f3b62eaf0c14a47d663abe9e1b821 Mon Sep 17 00:00:00 2001
From: Phil Burk <philburk@mobileer.com>
Date: Tue, 26 Jan 2021 15:25:10 -0800
Subject: [PATCH] mac autoconf: support current and future SDKs (#470)

Improve the way we generate the path to the SDK so that it
it not tied to specific Mac versions.

Also changed macosx-version-min to 10.6

Fixes #378
Fixes #468

Use xcrun instead of xcodebuild

Note that "configure" was generated using autoconf on Linux.
---
 .gitignore   |   1 +
 configure    | Bin 576931 -> 574696 bytes
 configure.in |  39 +++++----------------------------------
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b787f9..ed72e3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ lib-stamp
 lib/*
 libtool
 portaudio-2.0.pc
+autom4te.cache/*
 
 # Precompiled Headers
 *.gch
diff --git a/configure b/configure
index 34a341bdd51bb1616ed8d3eb63ae12868f780726..81c70f92476227dc2e9c9fdaf7b0c6847f6a678e 100755
GIT binary patch
delta 172
zcmZ2HTlqz&azhJa3sVbo3rh=Y3)>cUCNIUJ(mVxS-QtvNh1|sC{Nf5j13goaKt_H!
zNL06A`b8i1P)5_~AN<(0G*vVzk_qZaEXmNEe%FKDpV17gOAVVY6gxmVl-kup*te^P
IaMV-+050)3x&QzG

delta 1044
zcmaFSsl0f$azhJa3sVbo3rh=Y3)>cUCa>v9?(9N>y2UBk3b~2N`Nb86270Cn0n?Se
z*h8o5c(Q9xk9TJm)xuDaSdx*T#HD}&QgbrX6s9M*vx}e^Xa+Tq$wX=TM-O(f=@Y!z
zg|Qh7R7jG+=ENEdR7jG+7Q`A1R7jG+mc$wiREXbTA=EfAG{9-HHl|9_j5Z|NXrM~c
zj5Z?LXrM~cj5a3PXrM~cj5Z<KXrM~cjD}@C%)BCo7L7oaAfu<>^<Y<<zSn_KK+!qB
tG$%zNFTX?~Ei*4g0i2af@<Ftru|lwmx8C&s4vaGG)!yvetGzjLD*^1h9)17-

diff --git a/configure.in b/configure.in
index 90a811c..86048bd 100644
--- a/configure.in
+++ b/configure.in
@@ -234,41 +234,12 @@ case "${host_os}" in
               dnl as there *is* no /Developer, so we use -sdk to check
               dnl what SDKs are available and to get the full path of
               dnl the SDKs.
-              if xcodebuild -version -sdk macosx10.5 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.3"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.5 Path`"
-              elif xcodebuild -version -sdk macosx10.6 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.6 Path`"
-              elif xcodebuild -version -sdk macosx10.7 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.7 Path`"
-              elif xcodebuild -version -sdk macosx10.8 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.8 Path`"
-              elif xcodebuild -version -sdk macosx10.9 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.9 Path`"
-              elif xcodebuild -version -sdk macosx10.10 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.10 Path`"
-              elif xcodebuild -version -sdk macosx10.11 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.11 Path`"
-              elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`"
-              elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`"
-              elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`"
-              elif xcodebuild -version -sdk macosx10.15 Path >/dev/null 2>&1 ; then
-                 mac_version_min="-mmacosx-version-min=10.4"
-                 mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.15 Path`"
+              if xcrun --sdk macosx10.5 --show-sdk-path >/dev/null 2>&1 ; then
+                 mac_version_min="-mmacosx-version-min=10.5"
+                 mac_sysroot="-isysroot $(xcrun --sdk macosx10.5 --show-sdk-path)"
               else
-                 AC_MSG_ERROR([Could not find 10.5 to 10.13 SDK.])
+                 mac_version_min="-mmacosx-version-min=10.6"
+                 mac_sysroot="-isysroot $(xcrun --sdk macosx --show-sdk-path)"
               fi
            esac