X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetusershell.m4;h=17182dc96b07eabfa62de4fc525dee41522d67a8;hb=0963898828c9a6b76a2cf959f34b4e758fc4e265;hp=736077d7e1758155a5e15ba7627007c25e7dca86;hpb=44d7c1c1f004fa9bfb8ec3948de2671a7958cf5b;p=gnulib.git

diff --git a/m4/getusershell.m4 b/m4/getusershell.m4
index 736077d7e..17182dc96 100644
--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,19 +1,18 @@
-# getusershell.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# 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)
-])