--- a/ChangeLog	Wed May 27 14:44:16 2015 -0700
+++ b/ChangeLog	Wed May 27 16:05:44 2015 -0700
@@ -1,3 +1,14 @@
+2015-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	qacl: split into qcopy-acl and qset-acl
+	Emacs needs the former, but not the latter.
+	* modules/acl-permissions: New file, containing most of the old qacl.
+	* modules/file-has-acl (Depends-on): Depend on acl-permissions, not qacl.
+	* modules/qacl: Now merely depends on qcopy-acl and qset-acl.
+	* modules/qcopy-acl, modules/qset-acl: New files.
+	* MODULES.html.sh (File system functions):
+	Mention the new modules, and mention qacl while we're at it.
+
 2015-05-27  Glenn Morris  <rgm@gnu.org>
 
 	gitlog-to-changelog: new option --ignore-line

--- a/MODULES.html.sh	Wed May 27 14:44:16 2015 -0700
+++ b/MODULES.html.sh	Wed May 27 16:05:44 2015 -0700
@@ -2614,6 +2614,7 @@
 
   func_begin_table
   func_module acl
+  func_module acl-permissions
   func_module areadlink
   func_module areadlink-with-size
   func_module areadlinkat
@@ -2654,6 +2655,9 @@
   func_module openat
   func_module openat-die
   func_module pathmax
+  func_module qacl
+  func_module qcopy-acl
+  func_module qset-acl
   func_module read-file
   func_module readlinkat
   func_module same

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/acl-permissions	Wed May 27 16:05:44 2015 -0700
@@ -0,0 +1,37 @@
+Description:
+Access control lists of files.  (Unportable.)
+
+Files:
+lib/acl.h
+lib/acl-internal.h
+lib/acl-errno-valid.c
+lib/acl_entries.c
+lib/acl-internal.c
+lib/get-permissions.c
+lib/set-permissions.c
+m4/acl.m4
+
+Depends-on:
+extern-inline
+fstat
+stdbool
+sys_stat
+
+configure.ac:
+gl_FUNC_ACL
+
+Makefile.am:
+lib_SOURCES += acl-errno-valid.c acl-internal.c \
+  get-permissions.c set-permissions.c
+
+Include:
+"acl.h"
+
+Link:
+$(LIB_ACL)
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert, Jim Meyering

--- a/modules/file-has-acl	Wed May 27 14:44:16 2015 -0700
+++ b/modules/file-has-acl	Wed May 27 16:05:44 2015 -0700
@@ -5,7 +5,7 @@
 lib/file-has-acl.c
 
 Depends-on:
-qacl  [test $gl_need_lib_has_acl]
+acl-permissions  [test $gl_need_lib_has_acl]
 
 configure.ac:
 gl_FILE_HAS_ACL

--- a/modules/qacl	Wed May 27 14:44:16 2015 -0700
+++ b/modules/qacl	Wed May 27 16:05:44 2015 -0700
@@ -1,36 +1,21 @@
 Description:
 Access control lists of files.  (Unportable.)
+This is a placeholder module for backwards compatibility.
+New programs should use either qcopy-acl or qset-acl or both.
 
 Files:
-lib/acl.h
-lib/acl-internal.h
-lib/acl-errno-valid.c
-lib/acl_entries.c
-lib/acl-internal.c
-lib/get-permissions.c
-lib/qcopy-acl.c
-lib/qset-acl.c
-lib/set-permissions.c
-m4/acl.m4
 
 Depends-on:
-extern-inline
-fstat
-stdbool
-sys_stat
+qcopy-acl
+qset-acl
 
 configure.ac:
-gl_FUNC_ACL
 
 Makefile.am:
-lib_SOURCES += acl-errno-valid.c acl-internal.c qcopy-acl.c qset-acl.c \
-	get-permissions.c set-permissions.c
 
 Include:
-"acl.h"
 
 Link:
-$(LIB_ACL)
 
 License:
 GPL

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/qcopy-acl	Wed May 27 16:05:44 2015 -0700
@@ -0,0 +1,25 @@
+Description:
+Copy access control list from one file to another.  (Unportable.)
+
+Files:
+lib/qcopy-acl.c
+
+Depends-on:
+acl-permissions
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += qcopy-acl.c
+
+Include:
+"acl.h"
+
+Link:
+$(LIB_ACL)
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert, Jim Meyering

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/qset-acl	Wed May 27 16:05:44 2015 -0700
@@ -0,0 +1,25 @@
+Description:
+Set access control list of a file by specifying a mode.  (Unportable.)
+
+Files:
+lib/qset-acl.c
+
+Depends-on:
+acl-permissions
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += qset-acl.c
+
+Include:
+"acl.h"
+
+Link:
+$(LIB_ACL)
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert, Jim Meyering