[patch] Patch against udev-149 to get rid of acl dependencies

udev-149.patch (text/plain), 2.56 KB, created by Thomas on 2010-05-05 14:52:42 UTC

--- configure.ac.orig	2009-12-03 13:45:03.000000000 +0100
+++ configure.ac	2010-05-05 16:32:02.955511892 +0200
@@ -49,6 +49,9 @@
 AC_ARG_ENABLE([extras],
 	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
 	[], [enable_extras=yes])
+AC_ARG_ENABLE([acl],
+	AS_HELP_STRING([--enable-acl], [enable libacl dependencies]),
+	[], [enable_acl=no])
 if test "x$enable_extras" = xyes; then
 	AC_PATH_PROG([GPERF], [gperf])
 	if test -z "$GPERF"; then
@@ -58,10 +61,10 @@
 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
 	AC_SUBST([GLIB_CFLAGS])
 	AC_SUBST([GLIB_LIBS])
-
+if test "x$enable_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]))
-
+fi
 	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
 	AC_SUBST(LIBUSB_CFLAGS)
 	AC_SUBST(LIBUSB_LIBS)
@@ -83,6 +86,7 @@
 	AC_SUBST(PCI_DATABASE)
 fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
+AM_CONDITIONAL([ENABLE_ACL], [test "x$enable_acl" = xyes])
 
 AC_ARG_ENABLE([introspection],
 	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
--- Makefile.am.orig	2009-12-03 14:36:11.000000000 +0100
+++ Makefile.am	2010-05-05 16:37:00.511505866 +0200
@@ -417,6 +417,7 @@
 dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
 libexec_PROGRAMS += extras/hid2hci/hid2hci
 
+if ENABLE_ACL
 # ------------------------------------------------------------------------------
 # udev_acl - apply ACLs for users with local forground sessions
 # ------------------------------------------------------------------------------
@@ -431,6 +432,7 @@
 	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 INSTALL_EXEC_HOOKS += udevacl-install-hook
+endif # ENABLE_ACL
 
 # ------------------------------------------------------------------------------
 # usb-db - read USB vendor/device string database
@@ -448,6 +450,7 @@
 extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/usb-db/pci-db
 
+if ENABLE_ACL
 # ------------------------------------------------------------------------------
 # modem-modeswitch - magic config switch for 3G modems
 # ------------------------------------------------------------------------------
@@ -467,6 +470,7 @@
 	extras/modem-modeswitch/61-mobile-action.rules
 
 libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
+endif # ENABLE_ACL
 
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys