X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetusershell.m4;h=a9f852f31622d64007fbe21bcb73f39270cc326f;hb=68dd9ac979d5c3afd72f3d2fb0d6dcda32b3c384;hp=642124bd406f3cbbb5c03fbb7e9c3be449f5a1d4;hpb=53b8fa05726a7fb30010e42ce02e44a35f0d7489;p=gnulib.git

diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index 642124bd4..a9f852f31 100644
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,23 +1,28 @@
-# getusershell.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# 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.
 
 AC_DEFUN([gl_FUNC_GETUSERSHELL],
 [
-  AC_REPLACE_FUNCS(getusershell)
-  if test $ac_cv_func_getusershell = no; then
-    gl_PREREQ_GETUSERSHELL
-  fi
-])
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
 
-# Prerequisites of lib/getusershell.c.
-AC_DEFUN([gl_PREREQ_GETUSERSHELL], [
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(stdlib.h)
-  AC_CHECK_FUNCS_ONCE(isascii)
-])
+  dnl Persuade glibc <unistd.h> to declare {get,set,end}usershell().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
+  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
+])