Update Android port

* configure.ac (HAVE_MAILUTILS, with_mailutils)
(ANDROID_SDK_8_OR_EARLIER, XCONFIGURE): Fix POP and mailutils
configuration on Android.
* java/Makefile.in:
* src/callproc.c (syms_of_callproc): Avoid using built-in
movemail when --with-mailutils.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 8d3519fdab2..a1811a3bb23 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -2178,7 +2178,10 @@ the system.  */);
 Use this instead of calling `movemail' directly, as `movemail'
 may have been renamed to comply with executable naming restrictions on
 the system.  */);
-#if !defined HAVE_ANDROID || defined ANDROID_STUBIFY
+  /* Don't change the name of `movemail' if Emacs is being built to
+     use movemail from another source.  */
+#if !defined HAVE_ANDROID || defined ANDROID_STUBIFY    \
+  || defined HAVE_MAILUTILS
   Vmovemail_program_name = build_pure_c_string ("movemail");
 #else
   Vmovemail_program_name = build_pure_c_string ("libmovemail.so");