diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2016-11-11 16:17:18 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2016-11-17 14:15:42 +0200 |
| commit | 26e38bbcef1b7ab53290ed3a113a4328700e7e80 (patch) | |
| tree | df3bf317c82ff4612d2ae1aa8e1a6ce1cb820a4c | |
| parent | 64a08d1524a7d3832fd03f04ffd8fc7765877a15 (diff) | |
| download | bluez-26e38bbcef1b7ab53290ed3a113a4328700e7e80.tar.gz | |
build: Add option to enable NFC pairing
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.
| -rw-r--r-- | Makefile.plugins | 4 | ||||
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Makefile.plugins b/Makefile.plugins index 4ad2103e8..495cb8810 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 \ @@ -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 530d512ee..e1aa20a8c 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") |