From fdda4d506f434b8a8f050b4719564427cf5c8fcf Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Tue, 3 Jun 2014 20:54:39 +0400 Subject: [PATCH] Always enable STUN at compile time --- configure | 46 +++++++++++++++------------------------------ configure.ac | 15 +++------------ doc/guide.tex | 3 --- rebar.config.script | 4 ++-- vars.config.in | 1 - 5 files changed, 20 insertions(+), 49 deletions(-) diff --git a/configure b/configure index 6f62dec79..f0cd616a0 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for ejabberd community 13.12-119-g47a39ce. +# Generated by GNU Autoconf 2.67 for ejabberd community 14.05-68-g5de1649. # # Report bugs to . # @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ejabberd' PACKAGE_TARNAME='ejabberd' -PACKAGE_VERSION='community 13.12-119-g47a39ce' -PACKAGE_STRING='ejabberd community 13.12-119-g47a39ce' +PACKAGE_VERSION='community 14.05-68-g5de1649' +PACKAGE_STRING='ejabberd community 14.05-68-g5de1649' PACKAGE_BUGREPORT='ejabberd@process-one.net' PACKAGE_URL='' @@ -566,7 +566,6 @@ http debug iconv json -stun zlib pam pgsql @@ -666,7 +665,6 @@ enable_mysql enable_pgsql enable_pam enable_zlib -enable_stun enable_json enable_iconv enable_debug @@ -1222,7 +1220,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ejabberd community 13.12-119-g47a39ce to adapt to many kinds of systems. +\`configure' configures ejabberd community 14.05-68-g5de1649 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1283,7 +1281,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ejabberd community 13.12-119-g47a39ce:";; + short | recursive ) echo "Configuration of ejabberd community 14.05-68-g5de1649:";; esac cat <<\_ACEOF @@ -1307,10 +1305,10 @@ Optional Features: requires --enable-odbc) --enable-all same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib - --enable-stun --enable-riak --enable-json - --enable-iconv --enable-debug --enable-http - --enable-lager --enable-tools (useful for Dialyzer - checks, default: no) + --enable-riak --enable-json --enable-iconv + --enable-debug --enable-http --enable-lager + --enable-tools (useful for Dialyzer checks, default: + no) --enable-tools build development tools (default: no) --enable-nif replace some functions with C equivalents. Requires Erlang R13B04 or higher (default: no) @@ -1320,7 +1318,6 @@ Optional Features: --enable-pam enable PAM support (default: no) --enable-zlib enable Stream Compression (XEP-0138) using zlib (default: yes) - --enable-stun enable STUN support (default: no) --enable-json enable JSON support for mod_bosh (default: no) --enable-iconv enable iconv support (default: yes) --enable-debug enable debug information (default: yes) @@ -1407,7 +1404,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ejabberd configure community 13.12-119-g47a39ce +ejabberd configure community 14.05-68-g5de1649 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1466,7 +1463,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ejabberd $as_me community 13.12-119-g47a39ce, which was +It was created by ejabberd $as_me community 14.05-68-g5de1649, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2866,8 +2863,8 @@ fi # Check whether --enable-all was given. if test "${enable_all+set}" = set; then : enableval=$enable_all; case "${enableval}" in - yes) nif=true odbc=true mysql=true pgsql=true pam=true zlib=true stun=true riak=true json=true iconv=true debug=true http=true lager=true tools=true ;; - no) nif=false odbc=false mysql=false pgsql=false pam=false zlib=false stun=false riak=false json=false iconv=false debug=false http=false lager=false tools=false ;; + 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 ;; + 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 ;; *) as_fn_error $? "bad value ${enableval} for --enable-all" "$LINENO" 5 ;; esac fi @@ -2957,18 +2954,6 @@ else fi -# Check whether --enable-stun was given. -if test "${enable_stun+set}" = set; then : - enableval=$enable_stun; case "${enableval}" in - yes) stun=true ;; - no) stun=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-stun" "$LINENO" 5 ;; -esac -else - if test "x$stun" = "x"; then stun=false; fi -fi - - # Check whether --enable-json was given. if test "${enable_json+set}" = set; then : enableval=$enable_json; case "${enableval}" in @@ -3861,7 +3846,6 @@ fi - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4404,7 +4388,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ejabberd $as_me community 13.12-119-g47a39ce, which was +This file was extended by ejabberd $as_me community 14.05-68-g5de1649, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4457,7 +4441,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ejabberd config.status community 13.12-119-g47a39ce +ejabberd config.status community 14.05-68-g5de1649 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 853d91ecb..045ae01d9 100644 --- a/configure.ac +++ b/configure.ac @@ -106,10 +106,10 @@ AC_ARG_ENABLE(mssql, esac],[db_type=generic]) AC_ARG_ENABLE(all, -[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-stun --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-http --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])], [case "${enableval}" in - yes) nif=true odbc=true mysql=true pgsql=true pam=true zlib=true stun=true riak=true json=true iconv=true debug=true http=true lager=true tools=true ;; - no) nif=false odbc=false mysql=false pgsql=false pam=false zlib=false stun=false riak=false json=false iconv=false debug=false http=false lager=false tools=false ;; + 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 ;; + 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 ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;; esac],[]) @@ -169,14 +169,6 @@ AC_ARG_ENABLE(zlib, *) AC_MSG_ERROR(bad value ${enableval} for --enable-zlib) ;; esac],[if test "x$zlib" = "x"; then zlib=true; fi]) -AC_ARG_ENABLE(stun, -[AC_HELP_STRING([--enable-stun], [enable STUN support (default: no)])], -[case "${enableval}" in - yes) stun=true ;; - no) stun=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-stun) ;; -esac],[if test "x$stun" = "x"; then stun=false; fi]) - AC_ARG_ENABLE(json, [AC_HELP_STRING([--enable-json], [enable JSON support for mod_bosh (default: no)])], [case "${enableval}" in @@ -271,7 +263,6 @@ AC_SUBST(mysql) AC_SUBST(pgsql) AC_SUBST(pam) AC_SUBST(zlib) -AC_SUBST(stun) AC_SUBST(json) AC_SUBST(iconv) AC_SUBST(debug) diff --git a/doc/guide.tex b/doc/guide.tex index f81b50c06..ad7bd407c 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -396,9 +396,6 @@ Some options that you may be interested in modifying: \titem{--enable-zlib} Enable Stream Compression (XEP-0138) using zlib. - \titem{--enable-stun} - Enable STUN/TURN support (see section \ref{stun}). - \titem{--enable-iconv} Enable iconv support. This is needed for \term{mod\_irc} (see seciont \ref{modirc}). diff --git a/rebar.config.script b/rebar.config.script index f6772e0e8..bf1b510a7 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -44,6 +44,7 @@ HiPE = case lists:keysearch(hipe, 1, Cfg) of Includes = [{i, "include"}, {i, filename:join(["deps", "esip", "include"])}, + {i, filename:join(["deps", "p1_stun", "include"])}, {i, filename:join(["deps", "p1_xml", "include"])}], SrcDirs = lists:foldl( @@ -58,6 +59,7 @@ Deps = [{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}}, {p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}}, {p1_xml, ".*", {git, "git://github.com/processone/xml"}}, {esip, ".*", {git, "git://github.com/processone/p1_sip"}}, + {p1_stun, ".*", {git, "git://github.com/processone/stun"}}, {p1_yaml, ".*", {git, "git://github.com/processone/p1_yaml"}}, {xmlrpc, ".*", {git, "git://github.com/rds13/xmlrpc"}}], @@ -91,8 +93,6 @@ CfgDeps = lists:flatmap( [{p1_pam, ".*", {git, "git://github.com/processone/epam"}}]; ({zlib, true}) -> [{p1_zlib, ".*", {git, "git://github.com/processone/zlib"}}]; - ({stun, true}) -> - [{p1_stun, ".*", {git, "git://github.com/processone/stun"}}]; ({json, true}) -> [{jiffy, ".*", {git, "git://github.com/davisp/jiffy"}}]; ({iconv, true}) -> diff --git a/vars.config.in b/vars.config.in index 31c356fc9..d8270e17a 100644 --- a/vars.config.in +++ b/vars.config.in @@ -24,7 +24,6 @@ {pgsql, @pgsql@}. {pam, @pam@}. {zlib, @zlib@}. -{stun, @stun@}. {json, @json@}. {http, @http@}. {lager, @lager@}.