From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 23 Jan 2014 02:48:44 +0000 (-0800)
Subject: Merge from gnulib.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~283
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51fb39ec639a79f3fdcc378f5d99b0703a57e317;p=emacs.git

Merge from gnulib.

This incorporates:
2014-01-22 qacl: check for fchmod
* m4/acl.m4: Update from gnulib.
---

diff --git a/ChangeLog b/ChangeLog
index f9cec0339ce..a00981c219e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2014-01-22 qacl: check for fchmod
+	* m4/acl.m4: Update from gnulib.
+
 2014-01-22  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix miscellaneous update-game-score bugs.
diff --git a/m4/acl.m4 b/m4/acl.m4
index df8290e5deb..f02f69d22ac 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,5 +1,5 @@
 # acl.m4 - check for access control list (ACL) primitives
-# serial 16
+# serial 17
 
 # Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_ACL],
     AS_HELP_STRING([--disable-acl], [do not support ACLs]),
     , [enable_acl=auto])
 
+  AC_CHECK_FUNCS_ONCE([fchmod])
   LIB_ACL=
   use_acl=0
   if test "x$enable_acl" != "xno"; then