From dac5fbaa2da9f89da62d8b8c9e258cefb705610f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Nov 2013 18:34:28 +0100 Subject: [PATCH] move android variable initialization to a sane place it's beyond me how it landed in the middle of the sql driver detection. Change-Id: I7d1302e3440b8828a291e3009e9b130a2fdf165f Reviewed-by: Joerg Bornemann --- configure | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 4eb0dda8c8..6b2b88dac6 100755 --- a/configure +++ b/configure @@ -775,6 +775,14 @@ QT_LIBS_GLIB= # default qpa platform QT_QPA_DEFAULT_PLATFORM= +# Android vars +CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT +CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT +CFG_DEFAULT_ANDROID_PLATFORM=android-9 +CFG_DEFAULT_ANDROID_TARGET_ARCH=armeabi-v7a +CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION=4.8 +CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST + #------------------------------------------------------------------------------- # check SQL drivers available in this package #------------------------------------------------------------------------------- @@ -785,15 +793,6 @@ CFG_SQL_oci=no CFG_SQL_db2=no CFG_SQL_AVAILABLE= - -# Android vars -CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT -CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT -CFG_DEFAULT_ANDROID_PLATFORM=android-9 -CFG_DEFAULT_ANDROID_TARGET_ARCH=armeabi-v7a -CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION=4.8 -CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST - if [ -d "$relpath/src/plugins/sqldrivers" ]; then for a in "$relpath/src/plugins/sqldrivers/"*; do if [ -d "$a" ]; then