diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2013-01-16 10:31:26 -0300 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2013-01-16 13:34:22 -0600 |
| commit | 145112dad26f79c8d8eaa9f0f1411a49b6fb7001 (patch) | |
| tree | 58df45f7a700870ed470becd3f693cb6067c0717 | |
| parent | b67e68e75318f186bb97c8d14ca553725613e2f8 (diff) | |
| download | ofono-145112dad26f79c8d8eaa9f0f1411a49b6fb7001.tar.bz2 | |
build: Add configure option for BlueZ 5 support
Going forward, BlueZ 5 will be supported by default. BlueZ 4 support
will have to be explicitly enabled by using '--enable-bluez4'.
As before, the '--disable-bluetooth' configure option will disable all
bluetooth support (BlueZ 4 and BlueZ 5)
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 20 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 0d2ba9f6..c2bd4a4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -408,6 +408,7 @@ builtin_modules += sim900 builtin_sources += plugins/sim900.c if BLUETOOTH +if BLUEZ4 builtin_modules += bluetooth builtin_sources += plugins/bluetooth.c plugins/bluetooth.h @@ -434,6 +435,7 @@ builtin_cflags += @BLUEZ_CFLAGS@ builtin_libadd += @BLUEZ_LIBS@ endif endif +endif if PROVISION builtin_sources += plugins/mbpi.h plugins/mbpi.c @@ -742,6 +744,8 @@ tools_stktest_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ endif endif +if BLUETOOTH +if BLUEZ4 if DUNDEE sbin_PROGRAMS += dundee/dundee @@ -759,7 +763,8 @@ if SYSTEMD systemdunit_DATA += dundee/dundee.service endif endif - +endif +endif endif noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm diff --git a/configure.ac b/configure.ac index 450352b1..7db41982 100644 --- a/configure.ac +++ b/configure.ac @@ -173,14 +173,22 @@ AC_ARG_ENABLE(qmimodem, AC_HELP_STRING([--disable-qmimodem], AM_CONDITIONAL(QMIMODEM, test "${enable_qmimodem}" != "no") AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth], - [disable Bluetooth modem support]), + [disable BlueZ 4 and BlueZ 5 plugins support]), [enable_bluetooth=${enableval}]) -if (test "${enable_bluetooth}" != "no"); then - PKG_CHECK_MODULES(BLUEZ, bluez >= 4.99, dummy=yes, - AC_MSG_ERROR(Bluetooth library >= 4.99 is required)) + +AC_ARG_ENABLE(bluez4, AC_HELP_STRING([--enable-bluez4], + [enable BlueZ 4 plugins support prior to BlueZ 5]), + [enable_bluez4=${enableval}]) + +if (test "${enable_bluez4}" = "yes"); then + PKG_CHECK_MODULES(BLUEZ, bluez >= 4.99 bluez < 5, + enable_bluez4=yes, + AC_MSG_ERROR(Bluetooth library >= 4.99 and < 5 is required)) + AC_SUBST(BLUEZ_CFLAGS) + AC_SUBST(BLUEZ_LIBS) fi -AC_SUBST(BLUEZ_CFLAGS) -AC_SUBST(BLUEZ_LIBS) + +AM_CONDITIONAL(BLUEZ4, test "${enable_bluetooth}" != "no" && test "${enable_bluez4}" = "yes") AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no") AC_ARG_WITH([provisiondb], AC_HELP_STRING([--with-provisiondb=FILE], |