From 890d97816e56f2534b47715e7a702ca86e0219cf Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Wed, 1 Mar 2017 00:30:43 +0200
Subject: [PATCH] Use 	$(xcrun --sdk macosx --show-sdk-path) to parse
 SDK_PATH

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 MacOSX/build-package.in | 3 +--
 configure.ac            | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/MacOSX/build-package.in b/MacOSX/build-package.in
index 24d71f66..551d6ca0 100755
--- a/MacOSX/build-package.in
+++ b/MacOSX/build-package.in
@@ -11,8 +11,7 @@ test -x ./configure || ./bootstrap
 BUILDPATH=${PWD}
 
 # Locate the latest OSX SDK
-SDKS_PATH="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs"
-SDK_PATH="${SDK_PATH:-$SDKS_PATH/$(ls -1 ${SDKS_PATH} | sort -n -k2 -t. -r | head -1)}"
+SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
 
 # Set SDK path
 export CFLAGS="$CFLAGS -isysroot $SDK_PATH -arch x86_64 -mmacosx-version-min=10.10"
diff --git a/configure.ac b/configure.ac
index 1102afa1..9a4bd190 100644
--- a/configure.ac
+++ b/configure.ac
@@ -592,13 +592,8 @@ if test "${enable_pcsc}" = "yes"; then
 			case "${host}" in
 				*-*-darwin*)
 					# Locate the latest SDK.
-					SDKS_PATH="$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs"
-					if test -d $SDKS_PATH; then
-					    SDK_PATH="${SDK_PATH:-$SDKS_PATH/$(ls -1 ${SDKS_PATH} | sort -n -t. -k2 -r | head -1)}"
-					    PCSC_CFLAGS="-I$SDK_PATH/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers"
-					else
-					    PCSC_CFLAGS="-I/System/Library/Frameworks/PCSC.framework/Headers"
-					fi
+					SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
+					PCSC_CFLAGS="-I$SDK_PATH/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers"
 				;;
 				*)
 					PCSC_CFLAGS="-I/usr/include/PCSC"