diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-08-20 02:02:20 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-08-20 02:02:20 +0000 |
| commit | 80e725ed106e3281a12682325ee700305189295c (patch) | |
| tree | 5f016cde9d4ffe6fe041e65c83c10dca8e74a974 | |
| parent | 8803412684f97a032fceb0318a07e4969761a281 (diff) | |
Make installation of udev rules optional
| -rw-r--r-- | acinclude.m4 | 7 | ||||
| -rwxr-xr-x | bootstrap-configure | 3 | ||||
| -rw-r--r-- | scripts/Makefile.am | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 73d4e505..1fe8df05 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -114,6 +114,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ test_enable=no cups_enable=no initscripts_enable=no + pcmciarules_enable=no bccmd_enable=no avctrl_enable=no hid2hci_enable=${usb_found} @@ -139,6 +140,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ test_enable=${enableval} cups_enable=${enableval} initscripts_enable=${enableval} + pcmciarules_enable=${enableval} bccmd_enable=${enableval} avctrl_enable=${enableval} hid2hci_enable=${enableval} @@ -169,6 +171,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [ initscripts_enable=${enableval} ]) + AC_ARG_ENABLE(pcmciarules, AC_HELP_STRING([--enable-pcmciarules], [install PCMCIA udev rules]), [ + pcmciarules_enable=${enableval} + ]) + AC_ARG_ENABLE(bccmd, AC_HELP_STRING([--enable-bccmd], [install BCCMD interface utility]), [ bccmd_enable=${enableval} ]) @@ -204,6 +210,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") AM_CONDITIONAL(INITSCRIPTS, test "${initscripts_enable}" = "yes") + AM_CONDITIONAL(PCMCIARULES, test "${pcmciarules_enable}" = "yes") AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes" && test "${usb_found}" = "yes") AM_CONDITIONAL(AVCTRL, test "${avctrl_enable}" = "yes" && test "${usb_found}" = "yes") AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes") diff --git a/bootstrap-configure b/bootstrap-configure index 0df86183..29b326ee 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -13,4 +13,5 @@ fi --localstatedir=/var \ --libexecdir=/lib \ --enable-all \ - --disable-initscripts + --disable-initscripts \ + --disable-pcmciarules diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 55da7180..6a8eec7f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,4 +1,5 @@ +if PCMCIARULES rulesdir = $(sysconfdir)/udev rules_DATA = bluetooth.rules @@ -6,8 +7,9 @@ rules_DATA = bluetooth.rules udevdir = $(libexecdir)/udev udev_SCRIPTS = bluetooth_serial +endif -EXTRA_DIST = $(rules_DATA) $(udev_SCRIPTS) bluetooth.init bluetooth.default +EXTRA_DIST = bluetooth.rules bluetooth_serial bluetooth.init bluetooth.default MAINTAINERCLEANFILES = Makefile.in |