diff options
author | Werner Koch <[email protected]> | 2012-11-20 18:01:13 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2012-11-20 18:03:49 +0000 |
commit | 835698b72bc509565aad52b0753f1c56c1a8f062 (patch) | |
tree | dd5352b45d74cb3ef4b3091dcc16824ce57e4991 /configure.ac | |
parent | Fix non-portable use of chmod in autogen.sh. (diff) | |
download | gnupg-835698b72bc509565aad52b0753f1c56c1a8f062.tar.gz gnupg-835698b72bc509565aad52b0753f1c56c1a8f062.zip |
Do not use a broken ttyname.
* configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android
systems.
* common/util.h (gnupg_ttyname): New macro. Change all callers of
ttyname to use this macro instead.
(ttyname) [W32]: Rename to _gnupg_ttyname and use also if
HAVE_BROKEN_TTYNAME is defined.
* common/simple-pwquery.c (agent_send_all_options): Keep on using
ttyname unless HAVE_BROKEN_TTYNAME is set. This is because this file
may be used standalone.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 90c77faaa..e821b997e 100644 --- a/configure.ac +++ b/configure.ac @@ -1247,6 +1247,12 @@ AC_CHECK_FUNCS([atexit raise getpagesize strftime nl_langinfo setlocale]) AC_CHECK_FUNCS([waitpid wait4 sigaction sigprocmask pipe getaddrinfo]) AC_CHECK_FUNCS([ttyname rand ftello fsync stat lstat]) +if test "$have_android_system" = yes; then + # On Android ttyname is a stub but prints an error message. + AC_DEFINE(HAVE_BROKEN_TTYNAME,1, + [Defined if ttyname does not work properly]) +fi + AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>]) # Dirmngr requires mmap on Unix systems. |