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

diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index 642124bd4..fa13e8682 100644
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,23 +1,18 @@
-# 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 5
+dnl Copyright (C) 2002-2003, 2006, 2008-2010 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)
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+
+  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
-    gl_PREREQ_GETUSERSHELL
+    HAVE_GETUSERSHELL=0
   fi
 ])
-
-# 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)
-])
-