do not allow kernel properties to be set by udev rules

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index be3052cb733b41c933cfcf6bfd756165b7a31a4b..d1327ab5d24df223610b7e448c79f978e08cb3fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 AC_INIT([udev],
-       [171],
+       [172],
        [linux-hotplug@vger.kernel.org],
        [udev],
        [http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html])
@@ -126,20 +126,6 @@ if test "x$enable_hwdb" = xyes; then
 fi
 AM_CONDITIONAL([ENABLE_HWDB], [test "x$enable_hwdb" = xyes])
 
-# ------------------------------------------------------------------------------
-# udev_acl - apply ACLs for users with local forground sessions
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([udev_acl],
-       AS_HELP_STRING([--disable-udev_acl], [disable local user acl permissions support]),
-       [], [enable_udev_acl=yes])
-if test "x$enable_udev_acl" = xyes; then
-       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])
-fi
-AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = xyes])
-
 # ------------------------------------------------------------------------------
 # GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
@@ -183,6 +169,20 @@ if test "x$enable_keymap" = xyes; then
 fi
 AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = 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]),
+       [], [enable_udev_acl=no])
+if test "x$enable_udev_acl" = xyes; then
+       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])
+fi
+AM_CONDITIONAL([ENABLE_UDEV_ACL], [test "x$enable_udev_acl" = xyes])
+
 # ------------------------------------------------------------------------------
 # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
 # ------------------------------------------------------------------------------
@@ -199,17 +199,6 @@ AC_ARG_ENABLE([edd],
        [], [enable_edd=no])
 AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = xyes])
 
-# ------------------------------------------------------------------------------
-# mobile-action-modeswitch - switch Mobile Action cables into serial mode
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([action_modeswitch],
-       AS_HELP_STRING([--enable-action_modeswitch], [enable action modeswitch support]),
-       [], [enable_action_modeswitch=no])
-if test "x$enable_action_modeswitch" = xyes; then
-       PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
-fi
-AM_CONDITIONAL([ENABLE_ACTION_MODESWITCH], [test "x$enable_action_modeswitch" = xyes])
-
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
        Makefile
@@ -261,7 +250,6 @@ AC_MSG_RESULT([
        keymap:                 ${enable_keymap}
        floppy:                 ${enable_floppy}
        edd:                    ${enable_edd}
-       action_modeswitch:      ${enable_action_modeswitch}
 
        usb.ids:                ${USB_DATABASE}
        pci.ids:                ${PCI_DATABASE}