25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-14 17:08:57 +01:00

Do not build p1_logger if lager is enabled

This commit is contained in:
Evgeniy Khramtsov 2013-07-07 03:10:35 +10:00
parent 0aca3a4585
commit a302af7770
2 changed files with 5 additions and 3 deletions

View File

@ -52,8 +52,7 @@ SrcDirs = lists:foldl(
Acc
end, [], Cfg),
Deps = [{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}},
{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}},
Deps = [{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}},
{p1_tls, ".*", {git, "git://github.com/processone/tls"}},
{p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}},
{p1_xml, ".*", {git, "git://github.com/processone/xml"}},
@ -98,6 +97,8 @@ CfgDeps = lists:flatmap(
{lhttpc, ".*", {git, "git://github.com/esl/lhttpc"}}];
({lager, true}) ->
[{lager, ".*", {git, "git://github.com/basho/lager"}}];
({lager, false}) ->
[{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}}];
(_) ->
[]
end, Cfg),

View File

@ -28,7 +28,7 @@ ConfiguredOTPApps = lists:flatmap(
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(
fun({mysql, true}) -> [p1_mysql];
@ -40,6 +40,7 @@ DepConfiguredApps = lists:flatmap(
({iconv, true}) -> [p1_iconv];
({http, true}) -> [ibrowse, lhttpc];
({lager, true}) -> [lager];
({lager, false}) -> [p1_logger];
(_) -> []
end, Vars),