Minor fixes to configury

* configure.ac (ANDROID_SDK_8_OR_EARLIER): Pass through
`--with-ndk-cxx-shared'.
* m4/ndk-build.m4: Fix quoting of $CC.

diff --git a/configure.ac b/configure.ac
index d8772b7803e2eeac8f15f65355560e1456c3a0aa..0eb7db1cb2990e7b574b164125be286f3517f9b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,7 @@ if test "$XCONFIGURE" = "android"; then
   # Make sure to pass through the CFLAGS, as older versions of the
   # NDK require them to be able to find system includes.
   with_ndk_path="$android_ndk_path"
+  with_ndk_cxx_shared="$android_ndk_cxx_shared"
   ndk_INIT([$android_abi], [$ANDROID_SDK], [cross/ndk-build],\
            [$ANDROID_CFLAGS])
 fi
@@ -1150,9 +1151,11 @@ package will likely install on older systems but crash on startup.])
   passthrough="$passthrough --with-imagemagick=$with_imagemagick"
   passthrough="$passthrough --with-lcms2=$with_lcms2"
 
-  AS_IF([XCONFIGURE=android ANDROID_CC="$ANDROID_CC" \
-         ANDROID_SDK="$android_sdk" android_abi=$android_abi \
-        android_ndk_path="$with_ndk_path" $0 $passthrough], [],
+  AS_IF([XCONFIGURE=android ANDROID_CC="$ANDROID_CC"           \
+         ANDROID_SDK="$android_sdk" android_abi=$android_abi   \
+        android_ndk_path="$with_ndk_path"                      \
+        android_ndk_cxx_shared="$with_ndk_cxx_shared"          \
+        $0 $passthrough], [],
     [AC_MSG_ERROR([Failed to cross-configure Emacs for android.])])
 
   # Now set ANDROID to yes.

diff --git a/m4/ndk-build.m4 b/m4/ndk-build.m4
index 8fe84cee40edefe950357eb0c475e43d1fe56a91..d635b8d1a6b881f5fbf5852bec2875b99134e429 100644 (file)
--- a/m4/ndk-build.m4
+++ b/m4/ndk-build.m4
@@ -182,7 +182,7 @@ that could not be found in the list of directories specified in \
 }
 
 # Look for a suitable ar in the same directory as the C compiler.
-ndk_cc_firstword=`AS_ECHO([$CC]) | cut -d' ' -f1`
+ndk_cc_firstword=`AS_ECHO(["$CC"]) | cut -d' ' -f1`
 ndk_where_cc=`which $ndk_cc_firstword`
 ndk_ar_search_path=$PATH