diff options
| author | Badlop <badlop@process-one.net> | 2021-03-14 22:33:30 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2021-03-15 10:11:05 +0100 |
| commit | 14c8e1226fe05434b1438b7e7c80ab4a7a50c565 (patch) | |
| tree | 2bffc8ba9aa0d1309947c1c5ab326a1b08a115ad | |
| parent | Update Elixir logger, so logging should work now (diff) | |
Generate enabled_backends in ejabberd.app instead of configure (#3549)
Passing a list of atoms in vars.config.in (introduced in 3c16f214)
breaks rebar2 in "make rel"
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/ejabberd.app.src.script | 4 | ||||
| -rw-r--r-- | vars.config.in | 1 |
3 files changed, 3 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 9c5613227..c08075e52 100644 --- a/configure.ac +++ b/configure.ac @@ -283,17 +283,6 @@ case "`uname`" in ;; esac -enabled_backends="" -for backend in odbc mysql pgsql sqlite redis mssql; do - if eval test x\${$backend} = xtrue; then - if test "x$enabled_backends" = "x"; then - enabled_backends=$backend - else - enabled_backends="$enabled_backends, $backend" - fi - fi -done - AC_SUBST(roster_gateway_workaround) AC_SUBST(new_sql_schema) AC_SUBST(full_xml) @@ -317,6 +306,5 @@ AC_SUBST(system_deps) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) -AC_SUBST(enabled_backends) AC_OUTPUT diff --git a/src/ejabberd.app.src.script b/src/ejabberd.app.src.script index e06edc0bd..8248d9c16 100644 --- a/src/ejabberd.app.src.script +++ b/src/ejabberd.app.src.script @@ -1,8 +1,10 @@ Vars = case file:consult(filename:join([filename:dirname(SCRIPT), "..", "vars.config"])) of {ok, Terms} -> + Backends = [mssql, mysql, odbc, pgsql, redis, sqlite], + EBs = lists:filter(fun(Backend) -> lists:member({Backend, true}, Terms) end, Backends), [lists:keyfind(description, 1, Terms), lists:keyfind(vsn, 1, Terms), - {env, [lists:keyfind(enabled_backends, 1, Terms)]} + {env, [{enabled_backends, EBs}]} ]; _Err -> [] diff --git a/vars.config.in b/vars.config.in index 880f7133a..9b3ac7585 100644 --- a/vars.config.in +++ b/vars.config.in @@ -46,7 +46,6 @@ %% Variables for overlay template files {description, "@PACKAGE_NAME@"}. -{enabled_backends, [@enabled_backends@]}. %% Platform-specific installation paths {release, true}. |