X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetgroups.m4;h=54dbe8e93eea65ce556ad571d168170369b41093;hb=a6b16b69fe1cad695b270dd5bf3deb2850fc4dd1;hp=7b9416226aa3f700dfd6923bbb7033a8f6f5e64f;hpb=409d8f2d902cc6e12e40b08200f5dac27d0e98cb;p=gnulib.git

diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 7b9416226..54dbe8e93 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,31 +1,40 @@
-#serial 1
+# serial 16
 
 dnl From Jim Meyering.
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl  /* Define to rpl_getgroups if the replacement function should be used.  */
-dnl  #undef getgroups
-dnl
+dnl A wrapper around AC_FUNC_GETGROUPS.
 
-AC_DEFUN(jm_FUNC_GETGROUPS,
-[AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_CACHE_CHECK([for working getgroups], jm_cv_func_working_getgroups,
-  [AC_TRY_RUN([
-    int
-    main ()
-    {
-      /* On Ultrix 4.3, getgroups (0, 0) always fails.  */
-      exit (getgroups (0, 0) == -1 ? 1 : 0);
-    }
-	      ],
-	     jm_cv_func_working_getgroups=yes,
-             jm_cv_func_working_getgroups=no,
-	     dnl When crosscompiling, assume getgroups is broken.
-	     jm_cv_func_working_getgroups=no)
-  ])
-  if test $jm_cv_func_working_getgroups = no; then
-    LIBOBJS="$LIBOBJS getgroups.o"
-    AC_DEFINE_UNQUOTED(getgroups, rpl_getgroups)
+# Copyright (C) 1996-1997, 1999-2004, 2008-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.
+
+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"
 ])