X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fgetgroups.m4;h=08837173f56dd930cd40b096ca896de7d7709789;hb=9e83e486f6e0949ad5d3843011ae88c495681727;hp=094cfd2d4503078b4e36a8915faa91b5733199d7;hpb=e059c2358aad79ce8dfd9581dd6f12ce8503dc63;p=gnulib.git

diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 094cfd2d4..08837173f 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,26 +1,40 @@
-#serial 6
+# serial 16
 
 dnl From Jim Meyering.
-dnl
-dnl Invoking code should check $GETGROUPS_LIB something like this:
-dnl  jm_FUNC_GETGROUPS
-dnl  test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
-dnl
+dnl A wrapper around AC_FUNC_GETGROUPS.
 
-AC_DEFUN([jm_FUNC_GETGROUPS],
-[
-  AC_REQUIRE([AC_FUNC_GETGROUPS])
-  AC_SUBST([GETGROUPS_LIB])
-  if test $ac_cv_func_getgroups_works = no; then
-    AC_LIBOBJ(getgroups)
-    AC_DEFINE(getgroups, rpl_getgroups,
-      [Define as rpl_getgroups if getgroups doesn't work right.])
-    gl_PREREQ_GETGROUPS
-  fi
-])
+# Copyright (C) 1996-1997, 1999-2004, 2008-2012 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.
 
-# Prerequisites of lib/getgroups.c.
-AC_DEFUN([gl_PREREQ_GETGROUPS],
+AC_DEFUN([gl_FUNC_GETGROUPS],
 [
+  AC_REQUIRE([AC_FUNC_GETGROUPS])
   AC_REQUIRE([AC_TYPE_GETGROUPS])
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  if test "$ac_cv_func_getgroups" != yes; then
+    HAVE_GETGROUPS=0
+  elif test "$ac_cv_func_getgroups_works.$ac_cv_type_getgroups" != yes.gid_t
+  then
+    REPLACE_GETGROUPS=1
+    AC_DEFINE([GETGROUPS_ZERO_BUG], [1], [Define this to 1 if
+      getgroups(0,NULL) does not return the number of groups.])
+  else
+    dnl Detect FreeBSD bug; POSIX requires getgroups(-1,ptr) to fail.
+    AC_CACHE_CHECK([whether getgroups handles negative values],
+      [gl_cv_func_getgroups_works],
+      [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
+        [[int size = getgroups (0, 0);
+          gid_t *list = malloc (size * sizeof *list);
+          return getgroups (-1, list) != -1;]])],
+        [gl_cv_func_getgroups_works=yes],
+        [gl_cv_func_getgroups_works=no],
+        [gl_cv_func_getgroups_works="guessing no"])])
+    if test "$gl_cv_func_getgroups_works" != yes; then
+      REPLACE_GETGROUPS=1
+    fi
+  fi
+  test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
 ])