Port to certain Android environments with no GUI

* configure.ac (USER_FULL_NAME): Define to
android_user_full_name only when a GUI system is being built.
Otherwise, set to pw->pw_gecos or NULL consistently with the
presence of pw->pw_gecos.

* src/editfns.c (Fuser_full_name): Adjust to match.  Accept NULL
values from USER_FULL_NAME.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/editfns.c b/src/editfns.c
index fbfaaf66644..6b110b3d0e0 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1247,11 +1247,10 @@ is in general a comma-separated list.  */)
   if (!pw)
     return Qnil;
 
-#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY
-  p = android_user_full_name (pw);
-#else
   p = USER_FULL_NAME;
-#endif
+  if (!p)
+    return Qnil;
+
   /* Chop off everything after the first comma, since 'pw_gecos' is a
      comma-separated list. */
   q = strchr (p, ',');