We use four-column indentation steps

1 files changed, 31 insertions, 31 deletions

diff --git a/configure.in b/configure.in
index a360fffc8fcb..2c4580b126ec 100644
--- a/configure.in
+++ b/configure.in
@@ -122,42 +122,42 @@ AC_ARG_WITH(android-sdk,
 
 ANDROID_NDK_HOME=
 if test -n "$with_android_ndk"; then
-   ANDROID_NDK_HOME=$with_android_ndk
-
-   # Set up a lot of pre-canned defaults
-   # What if the NDK at some point starts including several toolchains for different
-   # gcc versions (like some 3rd-party improved NDK builds already do)?
-   # Then the use of a wildcard below will break.
-
-   # That indeed happened with NDK r8b, which has both gcc 4.4.3 and 4.6
-   # -based toolchains. The latter has interesting new features, like the
-   # possiblity to use the gold linker, which should bring a nice speedup to
-   # linking especially our libmerged. Work to support that in progress. Until
-   # that is done, please use no newer NDK than r8.
-   if test $host_cpu = arm; then
+    ANDROID_NDK_HOME=$with_android_ndk
+
+    # Set up a lot of pre-canned defaults
+    # What if the NDK at some point starts including several toolchains for different
+    # gcc versions (like some 3rd-party improved NDK builds already do)?
+    # Then the use of a wildcard below will break.
+
+    # That indeed happened with NDK r8b, which has both gcc 4.4.3 and 4.6
+    # -based toolchains. The latter has interesting new features, like the
+    # possiblity to use the gold linker, which should bring a nice speedup to
+    # linking especially our libmerged. Work to support that in progress. Until
+    # that is done, please use no newer NDK than r8.
+    if test $host_cpu = arm; then
         ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$host_cpu-linux*/prebuilt/*/bin`
         android_gcc_prefix=arm-linux-androideabi
-   else
+    else
         ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$host_cpu-*/prebuilt/*/bin`
         android_gcc_prefix=i686-android-linux
-   fi
+    fi
 
-   test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$host_cpu
-   test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-ar
-   test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-nm
-   test -z "$OBJDUMP" && OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-objdump
-   test -z "$RANLIB" && RANLIB=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-ranlib
-   test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-strip
-
-   if test $host_cpu = arm; then
-      ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
-      ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include"
-   else # x86
-      ANDROIDCFLAGS="-march=atom --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-x86 -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86"
-      ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86/include"
-   fi
-   test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-gcc $ANDROIDCFLAGS"
-   test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-g++ $ANDROIDCXXFLAGS"
+    test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$host_cpu
+    test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-ar
+    test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-nm
+    test -z "$OBJDUMP" && OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-objdump
+    test -z "$RANLIB" && RANLIB=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-ranlib
+    test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-strip
+
+    if test $host_cpu = arm; then
+        ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
+        ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include"
+    else # x86
+        ANDROIDCFLAGS="-march=atom --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-x86 -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86"
+        ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86/include"
+    fi
+    test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-gcc $ANDROIDCFLAGS"
+    test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/$android_gcc_prefix-g++ $ANDROIDCXXFLAGS"
 fi
 AC_SUBST(ANDROID_NDK_HOME)