X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetusershell.m4;h=17182dc96b07eabfa62de4fc525dee41522d67a8;hb=98e6017bf555489ddc02f15cc5db9da04f08b2d7;hp=a53d2c93e7ed8e7d8049e4b55e367a3eafce48ad;hpb=0a7a9905bf6051f5fb6cca69a85720f83424dd90;p=gnulib.git

diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index a53d2c93e..17182dc96 100644
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,22 +1,18 @@
-# getusershell.m4 serial 2
-dnl Copyright (C) 2002, 2003 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 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_FUNCS_ONCE(isascii)
-])
-