X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Feuidaccess.m4;h=841da01c5e5cb9607a665d814166b64c9efe56fc;hb=2c19fe9c2316d113610aa895d5203a9252cb692d;hp=5e8adace3d6ab74cc1ea05ab522ebd860da9dfe9;hpb=2d437590196e3c6880ca5c06029fcd73f0e16442;p=gnulib.git

diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4
index 5e8adace3..841da01c5 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 14
+dnl Copyright (C) 2002-2012 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.
@@ -22,10 +22,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
 ])
 
@@ -38,16 +37,16 @@ AC_DEFUN([gl_PREREQ_EUIDACCESS], [
   AC_CHECK_DECLS_ONCE([setregid])
   AC_REQUIRE([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
 ])