X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetgroups.m4;h=edc2bde9d90a71d6a64a33f66f3f490284595891;hb=9148e4d7d455e2624f43f4048652f77e11ec88cd;hp=37387dda3d85ac546bf2d1155cf5fd8c5f5a52ee;hpb=c281d94c469bec6e34b0ccf74f02f0d3c0c6f7e2;p=gnulib.git

diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 37387dda3..edc2bde9d 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,46 +1,29 @@
-#serial 3
+#serial 10
 
 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_TYPE_GETGROUPS])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_CHECK_FUNCS(getgroups)
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004 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.
 
- # If we don't yet have getgroups, see if it's in -lbsd.
- # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1.
- if test $ac_cv_func_getgroups = no; then
-   jm_cv_sys_getgroups_saved_lib="$LIBS"
-   AC_CHECK_LIB(bsd, getgroups, [GETGROUPS_LIB=-lbsd])
-   LIBS="$jm_cv_sys_getgroups_saved_lib"
- fi
-
- # Run the program to test the functionality of the system-supplied
- # getgroups function only if there is such a function.
- if test $ac_cv_func_getgroups = yes; then
-   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,
-	[Define as rpl_getgroups if getgroups doesn't work right.])
-    fi
+AC_DEFUN([gl_FUNC_GETGROUPS],
+[
+  AC_REQUIRE([AC_FUNC_GETGROUPS])
+  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
+  test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
+])
+
+# Prerequisites of lib/getgroups.c.
+AC_DEFUN([gl_PREREQ_GETGROUPS],
+[
+  AC_REQUIRE([AC_TYPE_GETGROUPS])
 ])