diff options
| author | Chen Ganir <chen.ganir@ti.com> | 2012-03-19 16:57:51 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-03-26 12:09:51 +0300 |
| commit | e407e9ac6d8bfde31f95ed5d7e7bcecf0cfe48ed (patch) | |
| tree | d15d702020aa74750dc4be37c2a92f7213f79ab1 /acinclude.m4 | |
| parent | 9c4712a9995f27c1dd7c8145ca54eb27f14af0a8 (diff) | |
| download | bluez-e407e9ac6d8bfde31f95ed5d7e7bcecf0cfe48ed.tar.gz | |
GATT: Remove individual config switches
Remove individual GATT plugin configuration switches and add a
new master gatt switch called --enable-gatt to enable/disable all
GATT related plugins at once.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b0f790cf1..429e466f4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -196,13 +196,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [ serial_enable=yes network_enable=yes sap_enable=no - proximity_enable=no - time_enable=no - alert_enable=no service_enable=yes health_enable=no pnat_enable=no - gatt_example_enable=no tools_enable=yes hidd_enable=no pand_enable=no @@ -219,7 +215,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ sap_driver=dummy dbusoob_enable=no wiimote_enable=no - thermometer_enable=no + gatt_enable=no AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [ optimization_enable=${enableval} @@ -246,18 +242,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ ]) AC_SUBST([SAP_DRIVER], [sap-${sap_driver}.c]) - AC_ARG_ENABLE(proximity, AC_HELP_STRING([--enable-proximity], [enable proximity plugin]), [ - proximity_enable=${enableval} - ]) - - AC_ARG_ENABLE(time, AC_HELP_STRING([--enable-time], [enable Time Profile plugin]), [ - time_enable=${enableval} - ]) - - AC_ARG_ENABLE(alert, AC_HELP_STRING([--enable-alert], [enable Phone Alert Profile plugin]), [ - alert_enable=${enableval} - ]) - AC_ARG_ENABLE(serial, AC_HELP_STRING([--disable-serial], [disable serial plugin]), [ serial_enable=${enableval} ]) @@ -282,10 +266,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ pnat_enable=${enableval} ]) - AC_ARG_ENABLE(gatt-example, AC_HELP_STRING([--enable-gatt-example], [enable GATT example plugin]), [ - gatt_example_enable=${enableval} - ]) - AC_ARG_ENABLE(gstreamer, AC_HELP_STRING([--enable-gstreamer], [enable GStreamer support]), [ gstreamer_enable=${enableval} ]) @@ -368,8 +348,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [ hal_enable=${enableval} ]) - AC_ARG_ENABLE(thermometer, AC_HELP_STRING([--enable-thermometer], [enable thermometer plugin]), [ - thermometer_enable=${enableval} + AC_ARG_ENABLE(gatt, AC_HELP_STRING([--enable-gatt], [enable gatt module]), [ + gatt_enable=${enableval} ]) if (test "${fortify_enable}" = "yes"); then @@ -404,15 +384,11 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(SERIALPLUGIN, test "${serial_enable}" = "yes") AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes") AM_CONDITIONAL(SAPPLUGIN, test "${sap_enable}" = "yes") - AM_CONDITIONAL(PROXIMITYPLUGIN, test "${proximity_enable}" = "yes") - AM_CONDITIONAL(TIMEPLUGIN, test "${time_enable}" = "yes") - AM_CONDITIONAL(ALERTPLUGIN, test "${alert_enable}" = "yes") AM_CONDITIONAL(SERVICEPLUGIN, test "${service_enable}" = "yes") AM_CONDITIONAL(HEALTHPLUGIN, test "${health_enable}" = "yes") AM_CONDITIONAL(MCAP, test "${health_enable}" = "yes") AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes") AM_CONDITIONAL(READLINE, test "${readline_found}" = "yes") - AM_CONDITIONAL(GATT_EXAMPLE_PLUGIN, test "${gatt_example_enable}" = "yes") AM_CONDITIONAL(PNATPLUGIN, test "${pnat_enable}" = "yes") AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes") AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes") @@ -428,5 +404,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(MAEMO6PLUGIN, test "${maemo6_enable}" = "yes") AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes") AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes") - AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes") + AM_CONDITIONAL(GATTMODULES, test "${gatt_enable}" = "yes") ]) |