X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=m4%2Feuidaccess.m4;h=12e5efcbe50ac7bbf1166e442d4f3cd97f5e1ff4;hb=167b0f9c9ca72a4f38ebcd8e3aa35f5f2f2484bf;hp=f1a175cdca184af11e3b136a7d47a9251040b8ac;hpb=bc366ae145683ca7ec1695c69cd2b4ed8f5bc589;p=gnulib.git

diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index f1a175cdc..12e5efcbe 100644
--- a/m4/euidaccess.m4
+++ b/m4/euidaccess.m4
@@ -1,5 +1,5 @@
-# euidaccess.m4 serial 11
-dnl Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# euidaccess.m4 serial 15
+dnl Copyright (C) 2002-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_NONREENTRANT_EUIDACCESS],
 [
   AC_REQUIRE([gl_FUNC_EUIDACCESS])
+  AC_CHECK_DECLS([setregid])
   AC_DEFINE([PREFER_NONREENTRANT_EUIDACCESS], [1],
     [Define this if you prefer euidaccess to return the correct result
      even if this would make it nonreentrant.  Define this only if your
@@ -22,10 +23,9 @@ AC_DEFUN([gl_FUNC_EUIDACCESS],
   dnl Persuade glibc <unistd.h> to declare euidaccess().
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_REPLACE_FUNCS([euidaccess])
+  AC_CHECK_FUNCS([euidaccess])
   if test $ac_cv_func_euidaccess = no; then
     HAVE_EUIDACCESS=0
-    gl_PREREQ_EUIDACCESS
   fi
 ])
 
@@ -34,19 +34,19 @@ AC_DEFUN([gl_PREREQ_EUIDACCESS], [
   dnl Prefer POSIX faccessat over non-standard euidaccess.
   AC_CHECK_FUNCS_ONCE([faccessat])
   dnl Try various other non-standard fallbacks.
-  AC_CHECK_HEADERS_ONCE([libgen.h])
-  AC_CHECK_DECLS_ONCE([setregid])
-  AC_REQUIRE([AC_FUNC_GETGROUPS])
+  AC_CHECK_HEADERS([libgen.h])
+  AC_FUNC_GETGROUPS
 
-  # Solaris 9 needs -lgen to get the eaccess function.
+  # Solaris 9 and 10 need -lgen to get the eaccess function.
   # Save and restore LIBS so -lgen isn't added to it.  Otherwise, *all*
   # programs in the package would end up linked with that potentially-shared
   # library, inducing unnecessary run-time overhead.
+  LIB_EACCESS=
+  AC_SUBST([LIB_EACCESS])
   gl_saved_libs=$LIBS
     AC_SEARCH_LIBS([eaccess], [gen],
                    [test "$ac_cv_search_eaccess" = "none required" ||
                     LIB_EACCESS=$ac_cv_search_eaccess])
-    AC_SUBST([LIB_EACCESS])
     AC_CHECK_FUNCS([eaccess])
   LIBS=$gl_saved_libs
 ])