[Libreoffice-commits] core.git: 2 commits - configure.ac

[Tor Lillqvist]

 configure.ac |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a4f4edb344805d1687333d1d7f46b4fde3f8d2c6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 14 14:28:07 2014 +0300

    Rename misleadingly named variable
    
    Change-Id: I48c7e2d29c16b61b71ef72a0a45792c968c0fa0f

diff --git a/configure.ac b/configure.ac
index 831ab32..e20f112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3114,7 +3114,7 @@ if test $_os = iOS; then
 
     xcode_developer=`xcode-select -print-path`
 
-    pref_sdk_ver=7.1
+    current_sdk_ver=7.1
     for sdkver in 8.0 7.1 7.0 6.1 6.0; do
         t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
         if test -d $t; then
@@ -3125,7 +3125,7 @@ if test $_os = iOS; then
     done
 
     if test -z "$sysroot"; then
-        AC_MSG_ERROR([Could not find iOS SDK, expected something like $xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${pref_sdk_ver}])
+        AC_MSG_ERROR([Could not find iOS SDK, expected something like $xcode_developer/Platforms/$platform.platform/Developer/SDKs/${platform}${current_sdk_ver}])
     fi
 
     AC_MSG_RESULT($sysroot)
commit fd56de496e2dbb4834ec4a5926f07e1c7d8a5d3f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 13 21:42:43 2014 +0300

    Look also for iOS SDK 8.0
    
    Change-Id: I0587e395f6b4833953618b1a0ac1e201a1f79b61

diff --git a/configure.ac b/configure.ac
index ff89d60..831ab32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3114,8 +3114,8 @@ if test $_os = iOS; then
 
     xcode_developer=`xcode-select -print-path`
 
-    pref_sdk_ver=7.0
-    for sdkver in 7.1 7.0 6.1 6.0; do
+    pref_sdk_ver=7.1
+    for sdkver in 8.0 7.1 7.0 6.1 6.0; do
         t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
         if test -d $t; then
             ios_sdk=$sdkver