From 312029eaab4f215fadf4182d3e09cdccddd5bf92 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 25 May 2009 18:58:28 +0200 Subject: [PATCH] Add support building Modem Manager plugin into the daemon --- bootstrap-configure | 2 +- configure.ac | 3 ++- plugins/Makefile.am | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bootstrap-configure b/bootstrap-configure index 6b8d523..cf46f2a 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 4e8895e..c1b0014 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 c4b73cf..8c315e5 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 -- 1.7.9.5