Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 318565
Collapse All | Expand All

(-)configure.ac.orig (-2 / +6 lines)
Lines 49-54 Link Here
49
AC_ARG_ENABLE([extras],
49
AC_ARG_ENABLE([extras],
50
	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
50
	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
51
	[], [enable_extras=yes])
51
	[], [enable_extras=yes])
52
AC_ARG_ENABLE([acl],
53
	AS_HELP_STRING([--enable-acl], [enable libacl dependencies]),
54
	[], [enable_acl=no])
52
if test "x$enable_extras" = xyes; then
55
if test "x$enable_extras" = xyes; then
53
	AC_PATH_PROG([GPERF], [gperf])
56
	AC_PATH_PROG([GPERF], [gperf])
54
	if test -z "$GPERF"; then
57
	if test -z "$GPERF"; then
Lines 58-67 Link Here
58
	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
61
	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
59
	AC_SUBST([GLIB_CFLAGS])
62
	AC_SUBST([GLIB_CFLAGS])
60
	AC_SUBST([GLIB_LIBS])
63
	AC_SUBST([GLIB_LIBS])
61
64
if test "x$enable_acl" = xyes; then
62
	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
65
	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
63
	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
66
	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
64
67
fi
65
	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
68
	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
66
	AC_SUBST(LIBUSB_CFLAGS)
69
	AC_SUBST(LIBUSB_CFLAGS)
67
	AC_SUBST(LIBUSB_LIBS)
70
	AC_SUBST(LIBUSB_LIBS)
Lines 83-88 Link Here
83
	AC_SUBST(PCI_DATABASE)
86
	AC_SUBST(PCI_DATABASE)
84
fi
87
fi
85
AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
88
AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
89
AM_CONDITIONAL([ENABLE_ACL], [test "x$enable_acl" = xyes])
86
90
87
AC_ARG_ENABLE([introspection],
91
AC_ARG_ENABLE([introspection],
88
	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
92
	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
(-)Makefile.am.orig (+4 lines)
Lines 417-422 Link Here
417
dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
417
dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
418
libexec_PROGRAMS += extras/hid2hci/hid2hci
418
libexec_PROGRAMS += extras/hid2hci/hid2hci
419
419
420
if ENABLE_ACL
420
# ------------------------------------------------------------------------------
421
# ------------------------------------------------------------------------------
421
# udev_acl - apply ACLs for users with local forground sessions
422
# udev_acl - apply ACLs for users with local forground sessions
422
# ------------------------------------------------------------------------------
423
# ------------------------------------------------------------------------------
Lines 431-436 Link Here
431
	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
432
	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
432
433
433
INSTALL_EXEC_HOOKS += udevacl-install-hook
434
INSTALL_EXEC_HOOKS += udevacl-install-hook
435
endif # ENABLE_ACL
434
436
435
# ------------------------------------------------------------------------------
437
# ------------------------------------------------------------------------------
436
# usb-db - read USB vendor/device string database
438
# usb-db - read USB vendor/device string database
Lines 448-453 Link Here
448
extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
450
extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
449
libexec_PROGRAMS += extras/usb-db/pci-db
451
libexec_PROGRAMS += extras/usb-db/pci-db
450
452
453
if ENABLE_ACL
451
# ------------------------------------------------------------------------------
454
# ------------------------------------------------------------------------------
452
# modem-modeswitch - magic config switch for 3G modems
455
# modem-modeswitch - magic config switch for 3G modems
453
# ------------------------------------------------------------------------------
456
# ------------------------------------------------------------------------------
Lines 467-472 Link Here
467
	extras/modem-modeswitch/61-mobile-action.rules
470
	extras/modem-modeswitch/61-mobile-action.rules
468
471
469
libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
472
libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
473
endif # ENABLE_ACL
470
474
471
# ------------------------------------------------------------------------------
475
# ------------------------------------------------------------------------------
472
# keymap - map custom hardware's multimedia keys
476
# keymap - map custom hardware's multimedia keys

Return to bug 318565