[PATCH 02/11] Assume unbroken ungetc() on Android

[Kevin Cernekee]

* m4/ungetc.m4: Add Android case to host OS check.  The ungetc()
test case passed when running on an Android host, and the code
hasn't really changed since 2009.
---
 ChangeLog    | 5 +++++
 m4/ungetc.m4 | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6f26301f28d..ad394da93ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,11 @@
        * lib/fwritable.c: Likewise.
        * lib/fwriting.c: Likewise.
 
+       Assume unbroken ungetc() on Android
+       * m4/ungetc.m4: Add Android case to host OS check.  The ungetc()
+       test case passed when running on an Android host, and the code
+       hasn't really changed since 2009.
+
 2015-02-08  Daiki Ueno  <address@hidden>
 
        uniname/unimame-tests: don't link with -lunistring
diff --git a/m4/ungetc.m4 b/m4/ungetc.m4
index c5c90f6d9cd0..2a34b3019f5a 100644
--- a/m4/ungetc.m4
+++ b/m4/ungetc.m4
@@ -29,8 +29,9 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
            fclose (f); remove ("conftest.tmp");])],
         [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
         [case "$host_os" in
-                   # Guess yes on glibc systems.
-           *-gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
+                   # Guess yes on glibc and bionic systems.
+           *-gnu*|*-android*)
+                   gl_cv_func_ungetc_works="guessing yes" ;;
                    # If we don't know, assume the worst.
            *)      gl_cv_func_ungetc_works="guessing no" ;;
          esac
-- 
2.2.0.rc0.207.ga3a616c