drop ACL support, udev-acl is in consolekit upstream

2 files changed, 0 insertions, 49 deletions

diff --git a/configure.ac b/configure.ac
index 85e9d4107a..b85f7b3c83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,44 +187,6 @@ fi
 AC_SUBST(sushell)
 
 # ------------------------------------------------------------------------------
-AC_ARG_ENABLE([acl],
-        AS_HELP_STRING([--disable-acl],[Disable optional ACL support]),
-                [case "${enableval}" in
-                        yes) have_acl=yes ;;
-                        no) have_acl=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-acl) ;;
-                esac],
-                [have_acl=auto])
-
-if test "x${have_acl}" != xno ; then
-        AC_CHECK_HEADERS(
-                [sys/acl.h acl/libacl.h],
-                [have_acl=yes],
-                [if test "x$have_acl" = xyes ; then
-                        AC_MSG_ERROR([*** ACL headers not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [acl],
-                [acl_get_file],
-                [have_acl=yes],
-                [if test "x$have_acl" = xyes ; then
-                        AC_MSG_ERROR([*** libacl not found.])
-                fi])
-
-        if test "x$have_acl" = xyes ; then
-                ACL_LIBS="-lacl"
-                AC_DEFINE(HAVE_ACL, 1, [ACL available])
-        else
-                have_acl=no
-        fi
-else
-        ACL_LIBS=
-fi
-AC_SUBST(ACL_LIBS)
-AM_CONDITIONAL([HAVE_ACL], [test "x$have_acl" != xno])
-
-# ------------------------------------------------------------------------------
 
 AC_CHECK_DECL([unshare],
         [AC_DEFINE(HAVE_UNSHARE, 1, [Define if unshare is declared])],
diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am
index 6f2de14cff..8f4eafe46e 100644
--- a/src/udev/Makefile.am
+++ b/src/udev/Makefile.am
@@ -52,7 +52,6 @@ libudev_core_la_SOURCES = \
 	udev-builtin-net_id.c \
 	udev-builtin-path_id.c \
 	udev-builtin-usb_id.c \
-	acl-util.c \
 	conf-files.c \
 	cgroup-util.c \
 	dev-setup.c \
@@ -60,7 +59,6 @@ libudev_core_la_SOURCES = \
 	hashmap.c \
 	label.c \
 	log.c \
-	logind-acl.c \
 	mkdir.c \
 	path-util.c \
 	sd-daemon.c \
@@ -71,7 +69,6 @@ libudev_core_la_SOURCES = \
 	util.c
 
 noinst_HEADERS = \
-	acl-util.h \
 	cgroup-util.h \
 	conf-files.h \
 	def.h \
@@ -81,7 +78,6 @@ noinst_HEADERS = \
 	ioprio.h \
 	label.h \
 	log.h \
-	logind-acl.h \
 	macro.h \
 	missing.h \
 	mkdir.h \
@@ -116,13 +112,6 @@ libudev_core_la_LIBADD += $(KMOD_LIBS)
 endif
 endif
 
-if HAVE_ACL
-libudev_core_la_SOURCES += \
-	udev-builtin-uaccess.c
-
-libudev_core_la_LIBADD += \
-        $(ACL_LIBS)
-endif
 
 
 libudev_core_la_CPPFLAGS = \