chiark / gitweb /
put acl.la in 'if HAVE_ACL' and rename acl.[ch] to acl-util.[ch]
authorKay Sievers <kay@vrfy.org>
Wed, 11 Apr 2012 14:39:31 +0000 (16:39 +0200)
committerKay Sievers <kay@vrfy.org>
Wed, 11 Apr 2012 14:47:09 +0000 (16:47 +0200)
Makefile.am
src/journal/journald.c
src/login/logind-acl.c
src/shared/acl-util.c [moved from src/shared/acl.c with 98% similarity]
src/shared/acl-util.h [moved from src/shared/acl.h with 100% similarity]

index 4ed1f12..493e15e 100644 (file)
@@ -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 += \
index 073bb89..ea23cff 100644 (file)
@@ -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
index e2e8696..eb8a48d 100644 (file)
@@ -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;
similarity index 98%
rename from src/shared/acl.c
rename to src/shared/acl-util.c
index d6a80f4..a2a9f9a 100644 (file)
@@ -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;
similarity index 100%
rename from src/shared/acl.h
rename to src/shared/acl-util.h