X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=m4%2Fopenat.m4;h=affb11455586a8c834c72ce11db1bc4518bea828;hb=a90c7558ac078a459cb204f5140ed74e16c65ed6;hp=71d960141b7122065159656d8c66ce7993fc490b;hpb=a14bd223642bd4673e2561c477190875764583eb;p=pspp

diff --git a/m4/openat.m4 b/m4/openat.m4
index 71d960141b..affb114555 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,7 +1,7 @@
-# serial 31
+# serial 33
 # See if we need to use our replacement for Solaris' openat et al functions.
 
-dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2011 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,27 +22,22 @@ AC_DEFUN([gl_FUNC_OPENAT],
   GNULIB_FCHOWNAT=1
   GNULIB_UNLINKAT=1
 
-  AC_LIBOBJ([openat-proc])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CHECK_FUNCS_ONCE([lchmod])
-  AC_REPLACE_FUNCS([fchmodat fstatat mkdirat openat unlinkat])
-  AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+  AC_CHECK_FUNCS([fchmodat fstatat mkdirat openat unlinkat])
+  AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   AC_REQUIRE([gl_FUNC_UNLINK])
-  case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in
+  case $ac_cv_func_openat+$gl_cv_func_lstat_dereferences_slashed_symlink in
   yes+yes)
     # GNU/Hurd has unlinkat, but it has the same bug as unlink.
     if test $REPLACE_UNLINK = 1; then
-      AC_LIBOBJ([unlinkat])
       REPLACE_UNLINKAT=1
     fi ;;
   yes+*)
     # Solaris 9 has *at functions, but uniformly mishandles trailing
     # slash in all of them.
-    AC_LIBOBJ([openat])
     REPLACE_OPENAT=1
-    AC_LIBOBJ([fstatat])
     REPLACE_FSTATAT=1
-    AC_LIBOBJ([unlinkat])
     REPLACE_UNLINKAT=1
     ;;
   *)
@@ -158,9 +153,6 @@ AC_DEFUN([gl_FUNC_FCHOWNAT],
        REPLACE_FCHOWNAT=1
      fi],
     [HAVE_FCHOWNAT=0])
-  if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then
-    AC_LIBOBJ([fchownat])
-  fi
 ])
 
 AC_DEFUN([gl_PREREQ_OPENAT],