LIBCRYPTO: Fix problem in finding android version for some NDKs

Author: mgorges

libraries/libcrypto/make.sh

@@ -35,6 +35,9 @@ macosx)
 android*)
     EXTRACONF="android-arm -D__ANDROID_API__=$SYS_ANDROIDAPI"
     XX_ANDROID_NDK_HOME=`find $SYS_PREFIX -name AndroidVersion.txt 2> /dev/null`
+    if [ "X$XX_ANDROID_NDK_HOME" = "X" ]; then
+      XX_ANDROID_NDK_HOME=`find $ANDROIDNDK -name AndroidVersion.txt 2> /dev/null`
+    fi
     export ANDROID_NDK_HOME=`dirname $XX_ANDROID_NDK_HOME`
     PATH=`ls -d $SYS_PREFIX/android-ndk-*-toolchain/bin`:$PATH
     # FIXME: This was better `clang` as Android is supposed to phase

make.sh

@@ -693,7 +693,7 @@ make_stringfile()
       string_srcs="$string_srcs $scmfile"
       if [ `isnewer $srcfile $scmfile` = "yes" ]; then
          echo " => $name.."
-         if [ $USE_XETEX = yes ]; then 
+         if [ "$USE_XETEX" = "yes" ]; then 
            make_string_latex $font $size "$label" $name $scmfile $opt
          else
            make_string_gd $font $size "$label" $name $scmfile
@@ -1326,7 +1326,7 @@ END
   fi
   cd $here_xelatex
   rm -rf $chkdir
-  if [ $USE_XETEX = no ]; then
+  if [ "$USE_XETEX" = "no" ]; then
     echo " ** Using GD to render strings"
   else
     touch $SYS_TMPDIR/.use_xetex