X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=8f6e004392e067150040bdcbbc40f3850c5ea2d1;hb=df4554c333aec1a4bc2c3335aef6e92f2c13bfcd;hp=a88a34c07dc3323a5e5f4b7c2ab9f7449557ed11;hpb=3840d318011a20960119ff8dff1f67825b2ca0f1;p=elogind.git

diff --git a/configure.ac b/configure.ac
index a88a34c07..8f6e00439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,20 +176,6 @@ AC_ARG_ENABLE([rule_generator],
        [], [enable_rule_generator=no])
 AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = "xyes"])
 
-# ------------------------------------------------------------------------------
-# udev_acl - apply ACLs for users with local forground sessions
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([udev_acl],
-       AS_HELP_STRING([--enable-udev_acl], [enable local user acl permissions support @<:@default=disabled@:>@]),
-       [], [enable_udev_acl=no])
-AS_IF([test "x$enable_udev_acl" = "xyes"], [
-       AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
-       AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
-
-       PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
-])
-AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = "xyes"])
-
 # ------------------------------------------------------------------------------
 # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
 # ------------------------------------------------------------------------------
@@ -219,8 +205,8 @@ AC_CONFIG_FILES([
        Makefile
        src/docs/Makefile
        src/docs/version.xml
-       src/extras/gudev/docs/Makefile
-       src/extras/gudev/docs/version.xml
+       src/gudev/docs/Makefile
+       src/gudev/docs/version.xml
 ])
 
 AC_OUTPUT
@@ -260,7 +246,6 @@ AC_MSG_RESULT([
         keymap:                  ${enable_keymap}
         mtd_probe:               ${enable_mtd_probe}
         rule_generator:          ${enable_rule_generator}
-        udev_acl:                ${enable_udev_acl}
         floppy:                  ${enable_floppy}
         edd:                     ${enable_edd}
 ])