diff options
| -rw-r--r-- | Makefile.plugins | 13 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | plugins/session_policy.c (renamed from plugins/session_default.c) | 4 |
3 files changed, 18 insertions, 9 deletions
diff --git a/Makefile.plugins b/Makefile.plugins index 263cb208..a6cda480 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -223,8 +223,17 @@ plugins_tist_la_LDFLAGS = $(plugin_ldflags) endif endif -builtin_modules += @SESSION_CONFIG_PLUGIN@ -builtin_sources += plugins/@SESSION_CONFIG_PLUGIN@.c +if SESSION_POLICY +if SESSION_POLICY_BUILTIN +builtin_modules += session_policy +builtin_sources += plugins/session_policy.c +else +plugin_LTLIBRARIES += plugins/session_policy.la +plugin_objects += $(plugins_session_policy_la_OBJECTS) +plugins_session_policy_la_CFLAGS = $(plugin_cflags) +plugins_session_policy_la_LDFLAGS = $(plugin_ldflags) +endif +endif EXTRA_DIST += plugins/polkit.policy diff --git a/configure.ac b/configure.ac index f43b2517..2a7b20b6 100644 --- a/configure.ac +++ b/configure.ac @@ -252,11 +252,11 @@ AC_ARG_ENABLE(tist, AM_CONDITIONAL(TIST, test "${enable_tist}" != "no") AM_CONDITIONAL(TIST_BUILTIN, test "${enable_tist}" = "builtin") -AC_ARG_WITH(configplugin, AC_HELP_STRING([--with-configplugin=PLUGIN], - [session config plugin]), [configplugin=${withval}], - [configplugin="session_default"]) -SESSION_CONFIG_PLUGIN="$configplugin" -AC_SUBST(SESSION_CONFIG_PLUGIN) +AC_ARG_ENABLE(session-policy, + AC_HELP_STRING([--enable-session-policy], [enable default Session policy configuration support]), + [enable_session_policy=${enableval}], [enable_session_policy="no"]) +AM_CONDITIONAL(SESSION_POLICY, test "${enable_session_policy}" != "no") +AM_CONDITIONAL(SESSION_POLICY_BUILTIN, test "${enable_session_policy}" = "builtin") AC_ARG_WITH(stats-max-file-size, AC_HELP_STRING([--with-stats-max-file-size=SIZE], [Maximal size of a statistics round robin file]), diff --git a/plugins/session_default.c b/plugins/session_policy.c index d62a5962..626d9bb7 100644 --- a/plugins/session_default.c +++ b/plugins/session_policy.c @@ -60,7 +60,7 @@ static int config_get_string(const char *id, const char *key, char **val) } static struct connman_session_config session_config = { - .name = "session default configuration", + .name = "session policy configuration", .get_bool = config_get_bool, .get_string = config_get_string, }; @@ -81,6 +81,6 @@ static void session_config_exit(void) connman_session_config_unregister(&session_config); } -CONNMAN_PLUGIN_DEFINE(session_default, "Session default configuration plugin", +CONNMAN_PLUGIN_DEFINE(session_policy, "Session policy configuration plugin", VERSION, CONNMAN_PLUGIN_PRIORITY_DEFAULT, session_config_init, session_config_exit) |