X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetlogin_r.m4;h=8e5a2a3c58c4c4155fc868d5d939cf3368ccc17a;hb=959d9cb463d992f9c5cc2fbeb54bf12eee2346f7;hp=b1d9c59ba388fcc1c8fe65906c8936174128eda1;hpb=118ba24d049832db7affcd30bed4209cb37b2b30;p=gnulib.git

diff --git a/m4/getlogin_r.m4 b/m4/getlogin_r.m4
index b1d9c59ba..8e5a2a3c5 100644
--- a/m4/getlogin_r.m4
+++ b/m4/getlogin_r.m4
@@ -1,6 +1,6 @@
-#serial 1
+#serial 4
 
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007 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,23 @@ dnl
 dnl Provide getlogin_r when the system lacks it.
 dnl
 
-AC_DEFUN([gl_GETLOGIN_R_SUBSTITUTE],
-[
-  gl_PREREQ_GETLOGIN_R
-  AC_LIBSOURCE([getlogin_r.h])
-  AC_LIBOBJ([getlogin_r])
-])
-
 AC_DEFUN([gl_GETLOGIN_R],
 [
-  AC_REPLACE_FUNCS([getlogin_r])
-  if test $ac_cv_func_strcasecmp = no; then
-    gl_GETLOGIN_R_SUBSTITUTE
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([getlogin_r])
+  if test $ac_cv_func_getlogin_r = no; then
+    AC_LIBOBJ([getlogin_r])
+    gl_PREREQ_GETLOGIN_R
+    if test $ac_cv_have_decl_getlogin_r = yes; then
+      HAVE_DECL_GETLOGIN_R=1
+    else
+      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])
+  AC_CHECK_DECLS_ONCE([getlogin_r])
 ])