From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 18 Oct 2016 09:50:22 +0000 (-0500)
Subject: bugfix #708: warnings and errors with xcode 6.1/7.0
X-Git-Tag: release-1.7.0-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7de10e25d1dba242fb663642484be8b5a90d78ed;p=thirdparty%2Fldns.git

bugfix #708: warnings and errors with xcode 6.1/7.0
---

diff --git a/Changelog b/Changelog
index a782e90f..62607016 100644
--- a/Changelog
+++ b/Changelog
@@ -83,6 +83,7 @@ TBD
 	  Thanks Hajimu UMEMOTO
 	* bugfix #760: Detect superfluous text in presentation format
 	  Thanks Xiali Yan
+	* bugfix #708: warnings and errors with xcode 6.1/7.0
 
 1.6.17	2014-01-10
 	* Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a
diff --git a/configure.ac b/configure.ac
index 0d2607f1..b542b244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,9 +660,16 @@ ACX_FUNC_IOCTLSOCKET
 ACX_CHECK_FORMAT_ATTRIBUTE
 ACX_CHECK_UNUSED_ATTRIBUTE
 
-# check OSX deployment target which is needed
+# check OSX deployment target, if needed
 if echo $build_os | grep darwin > /dev/null; then
- 	export MACOSX_DEPLOYMENT_TARGET="10.4"
+  sdk_p=`xcode-select -print-path`;
+  sdk_v="$( /usr/bin/xcrun --show-sdk-version )";
+  case $sdk_v in
+       10.11|10.10) sdk_c="10.10";;
+       10.9|10.8)   sdk_c="10.7";;
+  esac
+  export MACOSX_DEPLOYMENT_TARGET="${sdk_c}";
+  export CFLAGS="$CFLAGS -mmacosx-version-min=${sdk_c} -isysroot ${sdk_p}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdk_v}.sdk";
 fi
 
 AC_DEFINE([SYSCONFDIR], [sysconfdir], [System configuration dir])