Skip to content

Commit

Permalink
drop ACL support, udev-acl is in consolekit upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
axs-gentoo authored and blueness committed Dec 1, 2012
1 parent 7bfe5fc commit 1bbffd4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 49 deletions.
38 changes: 0 additions & 38 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -186,44 +186,6 @@ else
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],
Expand Down
11 changes: 0 additions & 11 deletions src/udev/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@ 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 \
exit-status.c \
hashmap.c \
label.c \
log.c \
logind-acl.c \
mkdir.c \
path-util.c \
sd-daemon.c \
Expand All @@ -71,7 +69,6 @@ libudev_core_la_SOURCES = \
util.c

noinst_HEADERS = \
acl-util.h \
cgroup-util.h \
conf-files.h \
def.h \
Expand All @@ -81,7 +78,6 @@ noinst_HEADERS = \
ioprio.h \
label.h \
log.h \
logind-acl.h \
macro.h \
missing.h \
mkdir.h \
Expand Down Expand Up @@ -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 = \
Expand Down

0 comments on commit 1bbffd4

Please sign in to comment.