Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Remove "--enable-http" flag 

Specifying the "--enable-http" flag on the ./configure command line had
no effect.
This commit is contained in:
Holger Weiss 2014-07-27 12:51:25 +02:00
parent c0001184fd
commit f1e6365ee1
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -106,10 +106,10 @@ AC_ARG_ENABLE(mssql,
esac],[db_type=generic]) esac],[db_type=generic])
AC_ARG_ENABLE(all, AC_ARG_ENABLE(all,
[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-riak --enable-json --enable-iconv --enable-debug --enable-http --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])], [AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-riak --enable-json --enable-iconv --enable-debug --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])],
[case "${enableval}" in [case "${enableval}" in
yes) nif=true odbc=true mysql=true pgsql=true pam=true zlib=true riak=true json=true iconv=true debug=true http=true lager=true tools=true ;; yes) nif=true odbc=true mysql=true pgsql=true pam=true zlib=true riak=true json=true iconv=true debug=true lager=true tools=true ;;
no) nif=false odbc=false mysql=false pgsql=false pam=false zlib=false riak=false json=false iconv=false debug=false http=false lager=false tools=false ;; no) nif=false odbc=false mysql=false pgsql=false pam=false zlib=false riak=false json=false iconv=false debug=false lager=false tools=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
esac],[]) esac],[])
@ -201,14 +201,6 @@ AC_ARG_ENABLE(debug,
*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
esac],[if test "x$debug" = "x"; then debug=true; fi]) esac],[if test "x$debug" = "x"; then debug=true; fi])
AC_ARG_ENABLE(http,
[AC_HELP_STRING([--enable-http], [build external HTTP libraries ('ibrowse' and 'lhttpc', default: no)])],
[case "${enableval}" in
yes) http=true ;;
no) http=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-http) ;;
esac],[if test "x$http" = "x"; then http=false; fi])
AC_ARG_ENABLE(lager, AC_ARG_ENABLE(lager,
[AC_HELP_STRING([--enable-lager], [enable lager support (default: yes)])], [AC_HELP_STRING([--enable-lager], [enable lager support (default: yes)])],
[case "${enableval}" in [case "${enableval}" in
@ -250,7 +242,6 @@ AC_SUBST(riak)
AC_SUBST(json) AC_SUBST(json)
AC_SUBST(iconv) AC_SUBST(iconv)
AC_SUBST(debug) AC_SUBST(debug)
AC_SUBST(http)
AC_SUBST(lager) AC_SUBST(lager)
AC_SUBST(tools) AC_SUBST(tools)

3
rebar.config.script
View File

@ -97,9 +97,6 @@ CfgDeps = lists:flatmap(
[{jiffy, ".*", {git, "git://github.com/davisp/jiffy"}}]; [{jiffy, ".*", {git, "git://github.com/davisp/jiffy"}}];
({iconv, true}) -> ({iconv, true}) ->
[{p1_iconv, ".*", {git, "git://github.com/processone/eiconv"}}]; [{p1_iconv, ".*", {git, "git://github.com/processone/eiconv"}}];
({http, true}) ->
[{ibrowse, ".*", {git, "git://github.com/cmullaparthi/ibrowse"}},
{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}) -> ({lager, false}) ->

1
rel/reltool.config.script
View File

@ -38,7 +38,6 @@ DepConfiguredApps = lists:flatmap(
({stun, true}) -> [p1_stun]; ({stun, true}) -> [p1_stun];
({json, true}) -> [jiffy]; ({json, true}) -> [jiffy];
({iconv, true}) -> [p1_iconv]; ({iconv, true}) -> [p1_iconv];
({http, true}) -> [ibrowse, lhttpc];
({lager, true}) -> [lager, goldrush]; ({lager, true}) -> [lager, goldrush];
({lager, false}) -> [p1_logger]; ({lager, false}) -> [p1_logger];
(_) -> [] (_) -> []

1
vars.config.in
View File

@ -26,7 +26,6 @@
{zlib, @zlib@}. {zlib, @zlib@}.
{riak, @riak@}. {riak, @riak@}.
{json, @json@}. {json, @json@}.
{http, @http@}.
{lager, @lager@}. {lager, @lager@}.
{iconv, @iconv@}. {iconv, @iconv@}.