summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-06-18 15:35:40 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-06-18 15:35:40 +0000
commit407a723fbd995760217d837d6bca7d6049d1fdbf (patch)
treee6ba52d64dfe4f3939f6e4bd3d5ca3370cbf5ce0
parent2efdbe3a944fb2c8c6e0f581b899140b4ef84bcb (diff)
Make netlink support optional and disable storage plugin
-rw-r--r--acinclude.m414
-rwxr-xr-xbootstrap-configure2
-rw-r--r--plugins/Makefile.am8
3 files changed, 15 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 53ff899f..d99b459f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -152,7 +152,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
fortify_enable=yes
pie_enable=yes
sndfile_enable=${sndfile_found}
- netlink_enable=${netlink_found}
+ netlink_enable=no
usb_enable=${usb_found}
alsa_enable=${alsa_found}
glib_enable=yes
@@ -161,19 +161,19 @@ AC_DEFUN([AC_ARG_BLUEZ], [
input_enable=yes
serial_enable=yes
network_enable=yes
+ tools_enable=yes
hidd_enable=no
pand_enable=no
dund_enable=no
cups_enable=no
test_enable=no
+ bccmd_enable=no
+ hid2hci_enable=no
+ dfutool_enable=no
manpages_enable=yes
configfiles_enable=yes
initscripts_enable=no
pcmciarules_enable=no
- tools_enable=yes
- bccmd_enable=no
- hid2hci_enable=no
- dfutool_enable=no
AC_ARG_ENABLE(fortify, AC_HELP_STRING([--disable-fortify], [disable compile time buffer checks]), [
fortify_enable=${enableval}
@@ -215,6 +215,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
usb_enable=${enableval}
])
+ AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
+ netlink_enable=${enableval}
+ ])
+
AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [
tools_enable=${enableval}
])
diff --git a/bootstrap-configure b/bootstrap-configure
index 56e0221f..ab7670fa 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -12,6 +12,8 @@ fi
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/lib \
+ --enable-netlink \
+ --enable-tools \
--enable-bccmd \
--enable-dfutool \
--enable-hid2hci \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2a3212e1..2e23a0a7 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -7,14 +7,14 @@ else
netlink_plugins =
endif
-plugin_LTLIBRARIES = libstorage.la $(netlink_plugins)
+plugin_LTLIBRARIES = $(netlink_plugins)
-libstorage_la_SOURCES = storage.c
-
-noinst_LTLIBRARIES = libecho.la
+noinst_LTLIBRARIES = libecho.la libstorage.la
libecho_la_SOURCES = echo.c
+libstorage_la_SOURCES = storage.c
+
if NETLINK
libnetlink_la_SOURCES = netlink.c