X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgroup-member.m4;h=a415a32b0288d5cb9ce1feb3d2c83748495f6b6a;hb=ee6855ea0843b56e6d9c3d6abde368ab22e5befe;hp=36fda49f15102fc94efb4f13cbf66b41912b2248;hpb=e059c2358aad79ce8dfd9581dd6f12ce8503dc63;p=gnulib.git

diff --git a/m4/group-member.m4 b/m4/group-member.m4
index 36fda49f1..a415a32b0 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,24 +1,33 @@
-#serial 4
+# serial 13
+
+# Copyright (C) 1999-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 dnl Written by Jim Meyering
 
-AC_DEFUN([jm_FUNC_GROUP_MEMBER],
+AC_DEFUN([gl_FUNC_GROUP_MEMBER],
 [
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+
   dnl Persuade glibc <unistd.h> to declare group_member().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   dnl Do this replacement check manually because I want the hyphen
   dnl (not the underscore) in the filename.
-  AC_CHECK_FUNC(group_member, , [
-    AC_LIBOBJ(group-member)
-    gl_PREREQ_GROUP_MEMBER
+  AC_CHECK_FUNC([group_member], , [
+    HAVE_GROUP_MEMBER=0
   ])
+  if test $HAVE_GROUP_MEMBER = 0; then
+    AC_LIBOBJ([group-member])
+    gl_PREREQ_GROUP_MEMBER
+  fi
 ])
 
 # Prerequisites of lib/group-member.c.
 AC_DEFUN([gl_PREREQ_GROUP_MEMBER],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_REQUIRE([AC_FUNC_GETGROUPS])
 ])