X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetlogin_r.m4;h=236872c96ed8bae09a901f0a74e2a28f42adf36e;hb=5510d3df6c49b73ed41fd3243c276f96a3c3f9d4;hp=b1d9c59ba388fcc1c8fe65906c8936174128eda1;hpb=118ba24d049832db7affcd30bed4209cb37b2b30;p=gnulib.git

diff --git a/m4/getlogin_r.m4 b/m4/getlogin_r.m4
index b1d9c59ba..236872c96 100644
--- a/m4/getlogin_r.m4
+++ b/m4/getlogin_r.m4
@@ -1,6 +1,6 @@
-#serial 1
+#serial 6
 
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,23 +11,25 @@ dnl
 dnl Provide getlogin_r when the system lacks it.
 dnl
 
-AC_DEFUN([gl_GETLOGIN_R_SUBSTITUTE],
+AC_DEFUN([gl_FUNC_GETLOGIN_R],
 [
-  gl_PREREQ_GETLOGIN_R
-  AC_LIBSOURCE([getlogin_r.h])
-  AC_LIBOBJ([getlogin_r])
-])
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
 
-AC_DEFUN([gl_GETLOGIN_R],
-[
-  AC_REPLACE_FUNCS([getlogin_r])
-  if test $ac_cv_func_strcasecmp = no; then
-    gl_GETLOGIN_R_SUBSTITUTE
+  dnl Persuade glibc <unistd.h> to declare getlogin_r().
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+  AC_CHECK_FUNCS_ONCE([getlogin_r])
+  if test $ac_cv_func_getlogin_r = no; then
+    AC_LIBOBJ([getlogin_r])
+    gl_PREREQ_GETLOGIN_R
+    AC_CHECK_DECLS_ONCE([getlogin_r])
+    if test $ac_cv_have_decl_getlogin_r = no; then
+      HAVE_DECL_GETLOGIN_R=0
+    fi
   fi
 ])
 
 AC_DEFUN([gl_PREREQ_GETLOGIN_R],
 [
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  AC_CHECK_DECLS_ONCE([getlogin getlogin_r])
+  AC_CHECK_DECLS_ONCE([getlogin])
 ])