From a04b5adede4022dd593af76cb2fc2e96cb34df91 Mon Sep 17 00:00:00 2001
From: Martin Matuska <martin@matuska.org>
Date: Tue, 28 Mar 2017 12:19:13 +0200
Subject: [PATCH] Encapsulate archive_disk_acl.* in an ARCHIVE_ACL_* ifdef This
 allows debugging and compilation with defines outside of configure.

---
 libarchive/archive_disk_acl_darwin.c  | 3 +++
 libarchive/archive_disk_acl_freebsd.c | 3 +++
 libarchive/archive_disk_acl_linux.c   | 3 +++
 libarchive/archive_disk_acl_sunos.c   | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/libarchive/archive_disk_acl_darwin.c b/libarchive/archive_disk_acl_darwin.c
index 0d3bc4e98..48ad01651 100644
--- a/libarchive/archive_disk_acl_darwin.c
+++ b/libarchive/archive_disk_acl_darwin.c
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_DARWIN
+
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -554,3 +556,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 	}
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_DARWIN */
diff --git a/libarchive/archive_disk_acl_freebsd.c b/libarchive/archive_disk_acl_freebsd.c
index eff9c22e9..07d08ff96 100644
--- a/libarchive/archive_disk_acl_freebsd.c
+++ b/libarchive/archive_disk_acl_freebsd.c
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_FREEBSD
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -695,3 +697,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_FREEBSD */
diff --git a/libarchive/archive_disk_acl_linux.c b/libarchive/archive_disk_acl_linux.c
index 6e9288d22..3928f3d6f 100644
--- a/libarchive/archive_disk_acl_linux.c
+++ b/libarchive/archive_disk_acl_linux.c
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -738,3 +740,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif	/* ARCHIVE_ACL_LIBACL */
 	return (ret);
 }
+#endif /* ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL */
diff --git a/libarchive/archive_disk_acl_sunos.c b/libarchive/archive_disk_acl_sunos.c
index 7d806b016..bc84fd678 100644
--- a/libarchive/archive_disk_acl_sunos.c
+++ b/libarchive/archive_disk_acl_sunos.c
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_SUNOS
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -816,3 +818,4 @@ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
 #endif
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_SUNOS */
-- 
2.47.2