diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-01-20 10:55:18 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-01-20 10:55:18 +0000 |
| commit | 70e9163c9c18e995515598085cb824e554eb7ae7 (patch) | |
| tree | a42dc8b2a6c031354bf31472de888bfc8a060132 /m4/getpass.m4 | |
| parent | cbf5993c43f49281173f185863577d86bfac6eae (diff) | |
| download | coreutils-tarball-70e9163c9c18e995515598085cb824e554eb7ae7.tar.gz | |
coreutils-8.25HEADcoreutils-8.25master
Diffstat (limited to 'm4/getpass.m4')
| -rw-r--r-- | m4/getpass.m4 | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/m4/getpass.m4 b/m4/getpass.m4 index 54348ce..f0e330c 100644 --- a/m4/getpass.m4 +++ b/m4/getpass.m4 @@ -1,5 +1,6 @@ -# getpass.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc. +# getpass.m4 serial 14 +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,10 +8,15 @@ dnl with or without modifications, as long as this notice is preserved. # Provide a getpass() function if the system doesn't have it. AC_DEFUN([gl_FUNC_GETPASS], [ - AC_REPLACE_FUNCS(getpass) - AC_CHECK_DECLS_ONCE(getpass) - if test $ac_cv_func_getpass = no; then - gl_PREREQ_GETPASS + dnl Persuade Solaris <unistd.h> and <stdlib.h> to declare getpass(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS([getpass]) + AC_CHECK_DECLS_ONCE([getpass]) + if test $ac_cv_func_getpass = yes; then + HAVE_GETPASS=1 + else + HAVE_GETPASS=0 fi ]) @@ -18,26 +24,31 @@ AC_DEFUN([gl_FUNC_GETPASS], # arbitrary length (not just 8 bytes as on HP-UX). AC_DEFUN([gl_FUNC_GETPASS_GNU], [ - AC_CHECK_DECLS_ONCE(getpass) + dnl Persuade Solaris <unistd.h> and <stdlib.h> to declare getpass(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_DECLS_ONCE([getpass]) dnl TODO: Detect when GNU getpass() is already found in glibc. - AC_LIBOBJ(getpass) - gl_PREREQ_GETPASS - dnl We must choose a different name for our function, since on ELF systems - dnl an unusable getpass() in libc.so would override our getpass() if it is - dnl compiled into a shared library. - AC_DEFINE([getpass], [gnu_getpass], - [Define to a replacement function name for getpass().]) + REPLACE_GETPASS=1 + + if test $REPLACE_GETPASS = 1; then + dnl We must choose a different name for our function, since on ELF systems + dnl an unusable getpass() in libc.so would override our getpass() if it is + dnl compiled into a shared library. + AC_DEFINE([getpass], [gnu_getpass], + [Define to a replacement function name for getpass().]) + fi ]) # Prerequisites of lib/getpass.c. AC_DEFUN([gl_PREREQ_GETPASS], [ - AC_CHECK_HEADERS_ONCE(stdio_ext.h termios.h) - AC_CHECK_FUNCS_ONCE(__fsetlocking tcgetattr tcsetattr) + AC_CHECK_HEADERS_ONCE([stdio_ext.h termios.h]) + AC_CHECK_FUNCS_ONCE([__fsetlocking tcgetattr tcsetattr]) AC_CHECK_DECLS([__fsetlocking],,, - [#include <stdio.h> - #if HAVE_STDIO_EXT_H - #include <stdio_ext.h> - #endif]) + [[#include <stdio.h> + #if HAVE_STDIO_EXT_H + #include <stdio_ext.h> + #endif]]) AC_CHECK_DECLS_ONCE([fflush_unlocked]) AC_CHECK_DECLS_ONCE([flockfile]) AC_CHECK_DECLS_ONCE([fputs_unlocked]) |