X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetgroups.m4;h=094cfd2d4503078b4e36a8915faa91b5733199d7;hb=69a9b8f8d7acc8677b5657adb83a8ba448737e0c;hp=c1e8dbf1e9b749a521cd2ed9aa837cb675327c4f;hpb=33e504dc96b66a5f51955facb9344ff65e5a9503;p=gnulib.git

diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index c1e8dbf1e..094cfd2d4 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,36 +1,26 @@
-#serial 1
+#serial 6
 
 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 Invoking code should check $GETGROUPS_LIB something like this:
+dnl  jm_FUNC_GETGROUPS
+dnl  test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
 dnl
 
-AC_DEFUN(jm_FUNC_GETGROUPS,
-[AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_CHECK_FUNCS(getgroups)
- # 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)
-    fi
+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
 ])
+
+# Prerequisites of lib/getgroups.c.
+AC_DEFUN([gl_PREREQ_GETGROUPS],
+[
+  AC_REQUIRE([AC_TYPE_GETGROUPS])
+])