diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-05-25 18:58:28 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-05-25 18:58:28 +0200 |
| commit | 312029eaab4f215fadf4182d3e09cdccddd5bf92 (patch) | |
| tree | 35c20d52cf9fd18b735b545ed1af46a8226b06af | |
| parent | 44ecadfc11389e5280fa9005c84efebb3262d765 (diff) | |
| download | connman-312029eaab4f215fadf4182d3e09cdccddd5bf92.tar.gz connman-312029eaab4f215fadf4182d3e09cdccddd5bf92.tar.bz2 connman-312029eaab4f215fadf4182d3e09cdccddd5bf92.zip | |
Add support building Modem Manager plugin into the daemon
| -rwxr-xr-x | bootstrap-configure | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | plugins/Makefile.am | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/bootstrap-configure b/bootstrap-configure index 6b8d523b..cf46f2ae 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -22,7 +22,7 @@ fi --enable-wifi=builtin \ --enable-bluetooth=builtin \ --enable-ofono=builtin \ - --enable-modemmgr \ + --enable-modemmgr=builtin \ --enable-udhcp=builtin \ --enable-dhclient=builtin \ --enable-resolvconf=builtin \ diff --git a/configure.ac b/configure.ac index 4e8895ed..c1b00147 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,8 @@ AM_CONDITIONAL(OFONO_BUILTIN, test "${enable_ofono}" = "builtin") AC_ARG_ENABLE(modemmgr, AC_HELP_STRING([--enable-modemmgr], [enable Modem Manager support]), [enable_modemmgr=${enableval}], [enable_modemmgr="no"]) -AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" = "yes") +AM_CONDITIONAL(MODEMMGR, test "${enable_modemmgr}" != "no") +AM_CONDITIONAL(MODEMMGR_BUILTIN, test "${enable_modemmgr}" = "builtin") AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM], [specify location of udhcpc binary]), [path_udhcpc=${withval}]) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index c4b73cf6..8c315e58 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -60,9 +60,14 @@ endif endif if MODEMMGR +if MODEMMGR_BUILTIN +builtin_modules += modemmgr +builtin_sources += modemmgr.c +else plugin_LTLIBRARIES += modemmgr.la modemmgr_la_LIBADD = @GDBUS_LIBS@ endif +endif if NOVATEL plugin_LTLIBRARIES += novatel.la |