put acl.la in 'if HAVE_ACL' and rename acl.[ch] to acl-util.[ch]

diff --git a/Makefile.am b/Makefile.am
index 4ed1f12dcc64a6715a7343fb4fd615a5b9569083..493e15e7c260e7984e450565f0e6eb5aea031d2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -629,12 +629,13 @@ libsystemd_audit_la_LIBADD = \
        libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
        libsystemd-capability.la
 
 # ------------------------------------------------------------------------------

+if HAVE_ACL

 noinst_LTLIBRARIES += \
        libsystemd-acl.la
 
 libsystemd_acl_la_SOURCES = \
 noinst_LTLIBRARIES += \
        libsystemd-acl.la
 
 libsystemd_acl_la_SOURCES = \

-       src/shared/acl.c \
-       src/shared/acl.h
+       src/shared/acl-util.c \
+       src/shared/acl-util.h

 
 libsystemd_acl_la_CFLAGS = \
        $(AM_CFLAGS) \
 
 libsystemd_acl_la_CFLAGS = \
        $(AM_CFLAGS) \


@@ -642,6 +643,7 @@ libsystemd_acl_la_CFLAGS = \
 
 libsystemd_acl_la_LIBADD = \
        $(ACL_LIBS)
 
 libsystemd_acl_la_LIBADD = \
        $(ACL_LIBS)

+endif

 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 073bb890aba6a69068514d16fea58b8d514f1fd0..ea23cff26e108e6875d52b19458c5c2e88dd81b2 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -51,7 +51,7 @@
 #ifdef HAVE_ACL
 #include <sys/acl.h>
 #include <acl/libacl.h>
 #ifdef HAVE_ACL
 #include <sys/acl.h>
 #include <acl/libacl.h>

-#include "acl.h"
+#include "acl-util.h"

 #endif
 
 #ifdef HAVE_SELINUX
 #endif
 
 #ifdef HAVE_SELINUX

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index e2e8696cdab1ed2af7ab31cfa620cec326ae47ec..eb8a48d191f03189df4ed1a243dc3d0352811780 100644 (file)
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -27,7 +27,7 @@
 
 #include "logind-acl.h"
 #include "util.h"
 
 #include "logind-acl.h"
 #include "util.h"

-#include "acl.h"
+#include "acl-util.h"

 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;

diff --git a/src/shared/acl.c b/src/shared/acl-util.c
similarity index 98%
rename from src/shared/acl.c
rename to src/shared/acl-util.c
index d6a80f44aec74542519b59759ddc5d738b2366a2..a2a9f9a22bb851cb2ebce5047eee69e53fa45925 100644 (file)
--- a/src/shared/acl.c
+++ b/src/shared/acl-util.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <stdbool.h>
 
 #include <errno.h>
 #include <stdbool.h>
 

-#include "acl.h"
+#include "acl-util.h"

 
 int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
         acl_entry_t i;
 
 int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
         acl_entry_t i;

diff --git a/src/shared/acl.h b/src/shared/acl-util.h
similarity index 100%
rename from src/shared/acl.h
rename to src/shared/acl-util.h