X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetusershell.m4;h=a9f852f31622d64007fbe21bcb73f39270cc326f;hb=9b604b4cbfad7422bacc1c723df1d027b6a7c738;hp=17182dc96b07eabfa62de4fc525dee41522d67a8;hpb=e5e9d7f6a05ec4d205deba79ccd196f4ab7120d7;p=gnulib.git

diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index 17182dc96..a9f852f31 100644
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,5 +1,5 @@
-# getusershell.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2006, 2008 Free Software Foundation, Inc.
+# getusershell.m4 serial 7
+dnl Copyright (C) 2002-2003, 2006, 2008-2011 Free Software Foundation, 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.
@@ -11,8 +11,18 @@ AC_DEFUN([gl_FUNC_GETUSERSHELL],
   dnl Persuade glibc <unistd.h> to declare {get,set,end}usershell().
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_REPLACE_FUNCS([getusershell])
-  if test $ac_cv_func_getusershell = no; then
+  dnl Check whether the getusershell function exists.
+  AC_CHECK_FUNCS_ONCE([getusershell])
+  if test $ac_cv_func_getusershell = yes; then
+    HAVE_GETUSERSHELL=1
+    dnl Check whether getusershell is declared.
+    AC_CHECK_DECLS([getusershell])
+    if test $ac_cv_have_decl_getusershell = no; then
+      HAVE_DECL_GETUSERSHELL=0
+    fi
+  else
     HAVE_GETUSERSHELL=0
+    dnl Assume that on platforms which declare it, the function exists.
+    HAVE_DECL_GETUSERSHELL=0
   fi
 ])