[BlueZ v2 00/10] build: Add options for every plugin

[BlueZ v2 00/10] build: Add options for every plugin

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds a build option for non-essential plugins so they can be
disable/enabled separately and leave options such as experimental only
for tools.

Plugins that were enabled by default were given a disable option, for
the option plugins behind experimental they are now supported with a
enable option and they continue to be build with bootstrap-configure.

This make one able to select exactly what plugins shall be build which,
so it is now possible to build bluetoothd without any BR/EDR profile
built-in which reduces the binary size of bluetoothd:

all options:
  text     data     bss     dec     hex filename
1271889  292976  294144 1859009  1c5dc1 src/bluetoothd

with --disable-a2dp --disable-avrcp --disable-network --disable-hid:
text       data     bss     dec     hex filename
1003609  227160  226464 1457233  163c51 src/bluetoothd

v2: Update README to reflect the options changes.

Luiz Augusto von Dentz (10):
  build: Add option to enable NFC pairing
  build: Add option to enable SAP profile
  build: Add option to disable A2DP profile
  build: Add option to disable AVRCP profile
  build: Add option to disable network profiles
  build: Add option to disable HID profile
  build: Add option to disable HoG profile
  build: Add option to enable health profiles
  build: Update experimental documentation
  build: Update bootstrap-configure with new build options

 Makefile.plugins    | 17 +++++++++--
 README              | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 bootstrap-configure |  3 ++
 configure.ac        | 34 ++++++++++++++++++++-
 4 files changed, 134 insertions(+), 7 deletions(-)

-- 
2.7.4

[BlueZ v2 01/10] build: Add option to enable NFC pairing

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds --enable-nfc option dedicated to enabled neard plugin
so it is no longer enabled with --enable-experimental since that
enables other plugins that might not be relevant for the system.
---
 Makefile.plugins | 4 +++-
 README           | 9 +++++++++
 configure.ac     | 4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Makefile.plugins b/Makefile.plugins
index 4ad2103..495cb88 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -11,10 +11,12 @@ builtin_sources += plugins/autopair.c
 builtin_modules += policy
 builtin_sources += plugins/policy.c
 
-if EXPERIMENTAL
+if NFC
 builtin_modules += neard
 builtin_sources += plugins/neard.c
+endif
 
+if EXPERIMENTAL
 builtin_modules += sap
 builtin_sources += profiles/sap/main.c profiles/sap/manager.h \
 			profiles/sap/manager.c profiles/sap/server.h \
diff --git a/README b/README
index c991ab0..23405f3 100644
--- a/README
+++ b/README
@@ -116,6 +116,15 @@ For a working system, certain configuration options need to be enabled:
 		systems. The APIs or behavior of the experimental plugins
 		is unstable and might still change.
 
+	--enable-nfc
+
+		This option enable NFC pairing support.
+
+		By default the integration with neard is disabled, this gives
+		the option to enable it in system where neard is supported.
+
+		The plugin is built into bluetoothd therefore it does not need
+		to be package separately.
 
 Information
 ===========
diff --git a/configure.ac b/configure.ac
index 530d512..e1aa20a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
 		[enable test/example scripts]), [enable_test=${enableval}])
 AM_CONDITIONAL(TEST, test "${enable_test}" = "yes")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-nfc],
+		[enable NFC paring]), [enable_nfc=${enableval}])
+AM_CONDITIONAL(NFC, test "${enable_nfc}" = "yes")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 02/10] build: Add option to enable SAP profile

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds --enable-sap option dedicated to enabled sap plugin
so it is no longer enabled with --enable-experimental leaving it to just
enable experimental tools.
---
 Makefile.plugins |  2 +-
 README           | 10 ++++++++++
 configure.ac     |  4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Makefile.plugins b/Makefile.plugins
index 495cb88..39eb3a0 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -16,7 +16,7 @@ builtin_modules += neard
 builtin_sources += plugins/neard.c
 endif
 
-if EXPERIMENTAL
+if SAP
 builtin_modules += sap
 builtin_sources += profiles/sap/main.c profiles/sap/manager.h \
 			profiles/sap/manager.c profiles/sap/server.h \
diff --git a/README b/README
index 23405f3..f084a74 100644
--- a/README
+++ b/README
@@ -126,6 +126,16 @@ For a working system, certain configuration options need to be enabled:
 		The plugin is built into bluetoothd therefore it does not need
 		to be package separately.
 
+	--enable-sap
+
+		This option enable SAP profile using sap plugin.
+
+		By default sap plugin is disabled since it requires tight
+		integration with systems and is very rarely required.
+
+		The plugin is built into bluetoothd therefore it does not need
+		to be package separately.
+
 Information
 ===========
 
diff --git a/configure.ac b/configure.ac
index e1aa20a..ce57b63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-nfc],
 		[enable NFC paring]), [enable_nfc=${enableval}])
 AM_CONDITIONAL(NFC, test "${enable_nfc}" = "yes")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-sap],
+		[enable SAP profile]), [enable_sap=${enableval}])
+AM_CONDITIONAL(SAP, test "${enable_sap}" = "yes")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 03/10] build: Add option to disable A2DP profile

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds --disable-a2dp option to configure which make A2DP plugin
to not be build thus reducing the build time and binary size of
bluetoothd in systems where A2DP is not supported.
---
 Makefile.plugins |  2 ++
 README           | 10 ++++++++++
 configure.ac     |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/Makefile.plugins b/Makefile.plugins
index 39eb3a0..e69ffab 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -27,6 +27,7 @@ noinst_LIBRARIES += profiles/sap/libsap.a
 profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-u8500.c
 endif
 
+if A2DP
 builtin_modules += a2dp
 builtin_sources += profiles/audio/source.h profiles/audio/source.c \
 			profiles/audio/sink.h profiles/audio/sink.c \
@@ -35,6 +36,7 @@ builtin_sources += profiles/audio/source.h profiles/audio/source.c \
 			profiles/audio/media.h profiles/audio/media.c \
 			profiles/audio/transport.h profiles/audio/transport.c \
 			profiles/audio/a2dp-codecs.h
+endif
 
 builtin_modules += avrcp
 builtin_sources += profiles/audio/control.h profiles/audio/control.c \
diff --git a/README b/README
index f084a74..9f6d4f1 100644
--- a/README
+++ b/README
@@ -105,6 +105,16 @@ For a working system, certain configuration options need to be enabled:
 		support systemd. In that case all integration with the
 		init system is up to the package.
 
+	--disable-a2dp
+
+		Disable A2DP profile
+
+		By default bluetoothd supports A2DP profile using a built-in
+		plugin, this option disables it.
+
+		This option is provided for distributions that do not have any
+		audio capabilities.
+
 	--enable-experimental
 
 		Enable experimental plugins
diff --git a/configure.ac b/configure.ac
index ce57b63..6761e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-sap],
 		[enable SAP profile]), [enable_sap=${enableval}])
 AM_CONDITIONAL(SAP, test "${enable_sap}" = "yes")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-a2dp],
+		[disable A2DP profile]), [enable_a2dp=${enableval}])
+AM_CONDITIONAL(A2DP, test "${enable_a2dp}" != "no")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 04/10] build: Add option to disable AVRCP profile

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds --disable-avrcp option to configure which make AVRCP plugin
to not be build thus reducing the build time and binary size of
bluetoothd in systems where AVRCP is not supported.
---
 Makefile.plugins |  3 +++
 README           | 10 ++++++++++
 configure.ac     |  4 ++++
 3 files changed, 17 insertions(+)

diff --git a/Makefile.plugins b/Makefile.plugins
index e69ffab..c9bc50c 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -38,11 +38,14 @@ builtin_sources += profiles/audio/source.h profiles/audio/source.c \
 			profiles/audio/a2dp-codecs.h
 endif
 
+
+if AVRCP
 builtin_modules += avrcp
 builtin_sources += profiles/audio/control.h profiles/audio/control.c \
 			profiles/audio/avctp.h profiles/audio/avctp.c \
 			profiles/audio/avrcp.h profiles/audio/avrcp.c \
 			profiles/audio/player.h profiles/audio/player.c
+endif
 
 builtin_modules += network
 builtin_sources += profiles/network/manager.c \
diff --git a/README b/README
index 9f6d4f1..ec3ed30 100644
--- a/README
+++ b/README
@@ -115,6 +115,16 @@ For a working system, certain configuration options need to be enabled:
 		This option is provided for distributions that do not have any
 		audio capabilities.
 
+	--disable-avrcp
+
+		Disable AVRCP profile
+
+		By default bluetoothd supports AVRCP profile using a built-in
+		plugin, this option disables it.
+
+		This option is provided for distributions that do not have any
+		audio capabilities.
+
 	--enable-experimental
 
 		Enable experimental plugins
diff --git a/configure.ac b/configure.ac
index 6761e29..99fbeb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-a2dp],
 		[disable A2DP profile]), [enable_a2dp=${enableval}])
 AM_CONDITIONAL(A2DP, test "${enable_a2dp}" != "no")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-avrcp],
+		[disable AVRCP profile]), [enable_avrcp=${enableval}])
+AM_CONDITIONAL(AVRCP, test "${enable_avrcp}" != "no")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 05/10] build: Add option to disable network profiles

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds --disable-network option to configure which make network plugin
to not be build thus reducing the build time and binary size of
bluetoothd in systems where those profiles are not supported.
---
 Makefile.plugins |  2 ++
 README           | 10 ++++++++++
 configure.ac     |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/Makefile.plugins b/Makefile.plugins
index c9bc50c..533922d 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -47,12 +47,14 @@ builtin_sources += profiles/audio/control.h profiles/audio/control.c \
 			profiles/audio/player.h profiles/audio/player.c
 endif
 
+if NETWORK
 builtin_modules += network
 builtin_sources += profiles/network/manager.c \
 			profiles/network/bnep.h profiles/network/bnep.c \
 			profiles/network/server.h profiles/network/server.c \
 			profiles/network/connection.h \
 			profiles/network/connection.c
+endif
 
 builtin_modules += input
 builtin_sources += profiles/input/manager.c \
diff --git a/README b/README
index ec3ed30..5137e34 100644
--- a/README
+++ b/README
@@ -125,6 +125,16 @@ For a working system, certain configuration options need to be enabled:
 		This option is provided for distributions that do not have any
 		audio capabilities.
 
+	--disable-network
+
+		Disable PANU, NAP, GN profiles
+
+		By default bluetoothd supports PANU, NAP and GN profile using a
+		built-in plugin, this option disables it.
+
+		This option is provided for distributions that do not have any
+		network capabilities.
+
 	--enable-experimental
 
 		Enable experimental plugins
diff --git a/configure.ac b/configure.ac
index 99fbeb8..63a5dfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-avrcp],
 		[disable AVRCP profile]), [enable_avrcp=${enableval}])
 AM_CONDITIONAL(AVRCP, test "${enable_avrcp}" != "no")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-network],
+		[disable network profiles]), [enable_network=${enableval}])
+AM_CONDITIONAL(NETWORK, test "${enable_network}" != "no")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 06/10] build: Add option to disable HID profile

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds --disable-hid option to configure which make input plugin
to not be build thus reducing the build time and binary size of
bluetoothd in systems where HID profile is not supported.
---
 Makefile.plugins |  2 ++
 README           | 10 ++++++++++
 configure.ac     |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/Makefile.plugins b/Makefile.plugins
index 533922d..c6951b1 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -56,11 +56,13 @@ builtin_sources += profiles/network/manager.c \
 			profiles/network/connection.c
 endif
 
+if HID
 builtin_modules += input
 builtin_sources += profiles/input/manager.c \
 			profiles/input/server.h profiles/input/server.c \
 			profiles/input/device.h profiles/input/device.c \
 			profiles/input/hidp_defs.h
+endif
 
 builtin_modules += hog
 builtin_sources += profiles/input/hog.c profiles/input/uhid_copy.h \
diff --git a/README b/README
index 5137e34..a73924d 100644
--- a/README
+++ b/README
@@ -135,6 +135,16 @@ For a working system, certain configuration options need to be enabled:
 		This option is provided for distributions that do not have any
 		network capabilities.
 
+	--disable-hid
+
+		Disable HID profile
+
+		By default bluetoothd supports HID profile using a built-in
+		plugin, this option disables it.
+
+		This option is provided for distributions that do not have any
+		input capabilities.
+
 	--enable-experimental
 
 		Enable experimental plugins
diff --git a/configure.ac b/configure.ac
index 63a5dfb..e63579e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-network],
 		[disable network profiles]), [enable_network=${enableval}])
 AM_CONDITIONAL(NETWORK, test "${enable_network}" != "no")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-hid],
+		[disable HID profile]), [enable_hid=${enableval}])
+AM_CONDITIONAL(HID, test "${enable_hid}" != "no")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 07/10] build: Add option to disable HoG profile

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds --disable-hog option to configure which make HoG plugin
to not be build thus reducing the build time and binary size of
bluetoothd in systems where HID over GATT profile is not supported.
---
 Makefile.plugins |  2 ++
 README           | 10 ++++++++++
 configure.ac     |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/Makefile.plugins b/Makefile.plugins
index c6951b1..ba58518 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -64,6 +64,7 @@ builtin_sources += profiles/input/manager.c \
 			profiles/input/hidp_defs.h
 endif
 
+if HOG
 builtin_modules += hog
 builtin_sources += profiles/input/hog.c profiles/input/uhid_copy.h \
 			profiles/input/hog-lib.c profiles/input/hog-lib.h \
@@ -73,6 +74,7 @@ builtin_sources += profiles/input/hog.c profiles/input/uhid_copy.h \
 			profiles/input/suspend.h profiles/input/suspend-none.c
 
 EXTRA_DIST += profiles/input/suspend-dummy.c
+endif
 
 if EXPERIMENTAL
 builtin_modules += health
diff --git a/README b/README
index a73924d..08c0ab4 100644
--- a/README
+++ b/README
@@ -145,6 +145,16 @@ For a working system, certain configuration options need to be enabled:
 		This option is provided for distributions that do not have any
 		input capabilities.
 
+	--disable-hog
+
+		Disable HoG profile
+
+		By default bluetoothd supports HoG profile using a built-in
+		plugin, this option disables it.
+
+		This option is provided for distributions that do not have any
+		input capabilities.
+
 	--enable-experimental
 
 		Enable experimental plugins
diff --git a/configure.ac b/configure.ac
index e63579e..3c2dc4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-hid],
 		[disable HID profile]), [enable_hid=${enableval}])
 AM_CONDITIONAL(HID, test "${enable_hid}" != "no")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-hog],
+		[disable HoG profile]), [enable_hog=${enableval}])
+AM_CONDITIONAL(HOG, test "${enable_hog}" != "no")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 08/10] build: Add option to enable health profiles

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds--enable-health option dedicated to enabled health plugin
so it is no longer enabled with --enable-experimental since that
enables other plugins that might not be relevant for the system.
---
 Makefile.plugins |  2 +-
 README           | 10 ++++++++++
 configure.ac     |  4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Makefile.plugins b/Makefile.plugins
index ba58518..59342c0 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -76,7 +76,7 @@ builtin_sources += profiles/input/hog.c profiles/input/uhid_copy.h \
 EXTRA_DIST += profiles/input/suspend-dummy.c
 endif
 
-if EXPERIMENTAL
+if HEALTH
 builtin_modules += health
 builtin_sources += profiles/health/mcap.h profiles/health/mcap.c \
 			profiles/health/hdp_main.c profiles/health/hdp_types.h \
diff --git a/README b/README
index 08c0ab4..823a204 100644
--- a/README
+++ b/README
@@ -186,6 +186,16 @@ For a working system, certain configuration options need to be enabled:
 		The plugin is built into bluetoothd therefore it does not need
 		to be package separately.
 
+	--enable-health
+
+		This option enable health profiles.
+
+		By default health plugin is disabled since its profiles are
+		target for the health industry.
+
+		The plugin is built into bluetoothd therefore it does not need
+		to be package separately.
+
 Information
 ===========
 
diff --git a/configure.ac b/configure.ac
index 3c2dc4d..24d7589 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,10 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--disable-hog],
 		[disable HoG profile]), [enable_hog=${enableval}])
 AM_CONDITIONAL(HOG, test "${enable_hog}" != "no")
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-health],
+		[enable health profiles]), [enable_health=${enableval}])
+AM_CONDITIONAL(HEALTH, test "${enable_health}" = "yes")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
-- 
2.7.4

[BlueZ v2 09/10] build: Update experimental documentation

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Reflect the build changes to only leave experimental tools being
--enable-experimental.
---
 README       | 8 ++++----
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 823a204..7b6001b 100644
--- a/README
+++ b/README
@@ -157,14 +157,14 @@ For a working system, certain configuration options need to be enabled:
 
 	--enable-experimental
 
-		Enable experimental plugins
+		Enable experimental tools
 
-		By default all plugins that are still in development
+		By default all tools that are still in development
 		are disabled. This option can be used to enable them.
 
 		It is not recommended to enable this option for production
-		systems. The APIs or behavior of the experimental plugins
-		is unstable and might still change.
+		systems. The behavior of the experimental tools is unstable
+		and might still change.
 
 	--enable-nfc
 
diff --git a/configure.ac b/configure.ac
index 24d7589..768a20c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,7 @@ AC_ARG_ENABLE(manpages, AC_HELP_STRING([--enable-manpages],
 AM_CONDITIONAL(MANPAGES, test "${enable_manpages}" = "yes")
 
 AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
-			[enable experimental plugins (SAP, NFC, ...)]),
+			[enable experimental tools]),
 					[enable_experimental=${enableval}])
 AM_CONDITIONAL(EXPERIMENTAL, test "${enable_experimental}" = "yes")
 
-- 
2.7.4

[BlueZ v2 10/10] build: Update bootstrap-configure with new build options

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

---
 bootstrap-configure | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bootstrap-configure b/bootstrap-configure
index 87766b1..ffc16ac 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -14,6 +14,9 @@ fi
 		--enable-manpages \
 		--enable-backtrace \
 		--enable-experimental \
+		--enable-nfc \
+		--enable-sap \
+		--enable-health \
 		--enable-android \
 		--enable-sixaxis \
 		--disable-datafiles $*
-- 
2.7.4