mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-20 16:15:59 +01:00
Do not build p1_logger if lager is enabled
This commit is contained in:
parent
0aca3a4585
commit
a302af7770
@ -52,8 +52,7 @@ SrcDirs = lists:foldl(
|
|||||||
Acc
|
Acc
|
||||||
end, [], Cfg),
|
end, [], Cfg),
|
||||||
|
|
||||||
Deps = [{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}},
|
Deps = [{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}},
|
||||||
{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}},
|
|
||||||
{p1_tls, ".*", {git, "git://github.com/processone/tls"}},
|
{p1_tls, ".*", {git, "git://github.com/processone/tls"}},
|
||||||
{p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}},
|
{p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}},
|
||||||
{p1_xml, ".*", {git, "git://github.com/processone/xml"}},
|
{p1_xml, ".*", {git, "git://github.com/processone/xml"}},
|
||||||
@ -98,6 +97,8 @@ CfgDeps = lists:flatmap(
|
|||||||
{lhttpc, ".*", {git, "git://github.com/esl/lhttpc"}}];
|
{lhttpc, ".*", {git, "git://github.com/esl/lhttpc"}}];
|
||||||
({lager, true}) ->
|
({lager, true}) ->
|
||||||
[{lager, ".*", {git, "git://github.com/basho/lager"}}];
|
[{lager, ".*", {git, "git://github.com/basho/lager"}}];
|
||||||
|
({lager, false}) ->
|
||||||
|
[{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}}];
|
||||||
(_) ->
|
(_) ->
|
||||||
[]
|
[]
|
||||||
end, Cfg),
|
end, Cfg),
|
||||||
|
@ -28,7 +28,7 @@ ConfiguredOTPApps = lists:flatmap(
|
|||||||
|
|
||||||
OTPApps = RequiredOTPApps ++ ConfiguredOTPApps,
|
OTPApps = RequiredOTPApps ++ ConfiguredOTPApps,
|
||||||
|
|
||||||
DepRequiredApps = [p1_logger, p1_cache_tab, p1_tls, p1_stringprep, p1_xml, xmlrpc],
|
DepRequiredApps = [p1_cache_tab, p1_tls, p1_stringprep, p1_xml, xmlrpc],
|
||||||
|
|
||||||
DepConfiguredApps = lists:flatmap(
|
DepConfiguredApps = lists:flatmap(
|
||||||
fun({mysql, true}) -> [p1_mysql];
|
fun({mysql, true}) -> [p1_mysql];
|
||||||
@ -40,6 +40,7 @@ DepConfiguredApps = lists:flatmap(
|
|||||||
({iconv, true}) -> [p1_iconv];
|
({iconv, true}) -> [p1_iconv];
|
||||||
({http, true}) -> [ibrowse, lhttpc];
|
({http, true}) -> [ibrowse, lhttpc];
|
||||||
({lager, true}) -> [lager];
|
({lager, true}) -> [lager];
|
||||||
|
({lager, false}) -> [p1_logger];
|
||||||
(_) -> []
|
(_) -> []
|
||||||
end, Vars),
|
end, Vars),
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user