diff options
| -rw-r--r-- | Makefile.am | 26 | ||||
| -rw-r--r-- | configure.ac | 16 |
2 files changed, 26 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index ce4799e4..da59be79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -286,15 +286,6 @@ builtin_sources += plugins/sierra.c builtin_modules += novatel builtin_sources += plugins/novatel.c -builtin_modules += nokia -builtin_sources += plugins/nokia.c - -builtin_modules += bluetooth -builtin_sources += plugins/bluetooth.c plugins/bluetooth.h - -builtin_modules += hfp -builtin_sources += plugins/hfp.c plugins/bluetooth.h - builtin_modules += palmpre builtin_sources += plugins/palmpre.c @@ -313,8 +304,22 @@ builtin_sources += plugins/caif.c builtin_modules += tc65 builtin_sources += plugins/tc65.c +builtin_modules += nokia +builtin_sources += plugins/nokia.c + builtin_modules += nokiacdma builtin_sources += plugins/nokiacdma.c + +if BLUETOOTH +builtin_modules += bluetooth +builtin_sources += plugins/bluetooth.c plugins/bluetooth.h + +builtin_modules += hfp +builtin_sources += plugins/hfp.c plugins/bluetooth.h + +builtin_cflags += @BLUEZ_CFLAGS@ +builtin_libadd += @BLUEZ_LIBS@ +endif endif if MAINTAINER_MODE @@ -351,8 +356,7 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \ src/smsagent.c src/smsagent.h src/ctm.c \ src/cdma-voicecall.c -src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ \ - @BLUEZ_LIBS@ -ldl +src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl src_ofonod_LDFLAGS = -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/src/ofono.ver diff --git a/configure.ac b/configure.ac index 2a650b10..91c53454 100644 --- a/configure.ac +++ b/configure.ac @@ -102,11 +102,6 @@ else fi AC_SUBST(DBUS_CONFDIR) -PKG_CHECK_MODULES(BLUEZ, bluez, dummy=yes, - AC_MSG_ERROR(libbluetooth is required)) -AC_SUBST(BLUEZ_CFLAGS) -AC_SUBST(BLUEZ_LIBS) - AC_ARG_WITH(dbusdatadir, AC_HELP_STRING([--with-dbusdatadir=PATH], [path to D-Bus data directory]), [path_dbusdata=${withval}], [path_dbusdata="`$PKG_CONFIG --variable=datadir dbus-1`"]) @@ -189,6 +184,17 @@ AC_ARG_ENABLE(isimodem, AC_HELP_STRING([--disable-isimodem], [enable_isimodem=${enableval}]) AM_CONDITIONAL(ISIMODEM, test "${enable_isimodem}" != "no") +AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth], + [disable Bluetooth modem support]), + [enable_bluetooth=${enableval}]) +if (test "${enable_bluetooth}" != "no"); then + PKG_CHECK_MODULES(BLUEZ, bluez, dummy=yes, + AC_MSG_ERROR(Bluetooth library is required)) +fi +AC_SUBST(BLUEZ_CFLAGS) +AC_SUBST(BLUEZ_LIBS) +AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no") + AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [don't install configuration and data files]), [enable_datafiles=${enableval}]) |