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

[Christian Lohmaier]

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

New commits:
commit 3e522fcbaad0848a2fb4d4d5a5c0bfe81475249d
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Nov 10 11:52:55 2016 +0100

    demote "unknown android ndk" to warning only (and add 13.1 as known)
    
    android studio/sdk manager doesn't provide a default way to install
    multiple versions of the NDK, so typically only the latest one will be
    available. Don't make configure error out in this case, but print a
    warning instead.
    
    Change-Id: I6af9a3f088daf7d12ebd9910286d7f44d264014a

diff --git a/configure.ac b/configure.ac
index 5c11dc6..1c1c87f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,14 +361,17 @@ if test -n "$with_android_ndk"; then
     else
         ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
     fi
-
+    if test -z "$ANDROID_NDK_VERSION";  then
+        AC_MSG_ERROR([Failed to determine android NDK version. Please check your installation.])
+    fi
     case $ANDROID_NDK_VERSION in
     r9*|r10*)
         ;;
-    11.1.*|12.1.*)
+    11.1.*|12.1.*|13.1.*)
         ;;
     *)
-        AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9*, r10*, 11.1.* and 12.1.* are supported])
+        AC_MSG_WARN([Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 13.1.* have been used successfully. Proceed at your own risk.])
+        add_warning "Untested android NDK version $ANDROID_NDK_VERSION, only versions r9* til 13.1.* have been used successfully. Proceed at your own risk."
         ;;
     esac