>From 052169efee500c4c8a8b9e0433f1cd703f99ea89 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sun, 13 May 2018 15:31:48 +0200
Subject: [PATCH 1/9] grantpt: Fix compilation error on Android.

* m4/grantpt.m4 (gl_FUNC_GRANTPT): Use AC_LINK_IFELSE instead of
AC_CHECK_FUNC.
---
 ChangeLog     |  6 ++++++
 m4/grantpt.m4 | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4c0138..2c6eab8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2018-05-13  Bruno Haible  <address@hidden>
 
+	grantpt: Fix compilation error on Android.
+	* m4/grantpt.m4 (gl_FUNC_GRANTPT): Use AC_LINK_IFELSE instead of
+	AC_CHECK_FUNC.
+
+2018-05-13  Bruno Haible  <address@hidden>
+
 	stdioext: Fix compilation errors with newer Android headers.
 	* lib/stdio-impl.h (fp_, fp_ub): Define differently for Android.
 	(__SLBF, __SNBF, __SRD, __SWR, __SRW, __SEOF, __SERR, __SOFF): Define
diff --git a/m4/grantpt.m4 b/m4/grantpt.m4
index 7e2ee4a..91d8183 100644
--- a/m4/grantpt.m4
+++ b/m4/grantpt.m4
@@ -1,4 +1,4 @@
-# grantpt.m4 serial 2
+# grantpt.m4 serial 3
 dnl Copyright (C) 2010-2018 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,8 +11,18 @@ AC_DEFUN([gl_FUNC_GRANTPT],
   dnl Persuade glibc <stdlib.h> to declare grantpt().
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_CHECK_FUNCS([grantpt])
-  if test $ac_cv_func_grantpt = no; then
+  dnl We can't use AC_CHECK_FUNC here, because grantpt() is defined as a
+  dnl static inline function when compiling for Android 4.4 or older.
+  AC_CACHE_CHECK([for grantpt], [gl_cv_func_grantpt],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdlib.h>]],
+          [[return grantpt(0);]])
+       ],
+       [gl_cv_func_grantpt=yes],
+       [gl_cv_func_grantpt=no])
+    ])
+  if test $gl_cv_func_grantpt = no; then
     HAVE_GRANTPT=0
   fi
 ])
-- 
2.7.4