Always enable SIP at compile time

diff --git a/configure b/configure
index e26d6e894345ef3863cd72a1aa015a75aa3d2c81..6f62dec79596e51ea6d16fb853858712ed549e22 100755 (executable)
--- 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-100-gec6c58a.
+# Generated by GNU Autoconf 2.67 for ejabberd community 13.12-119-g47a39ce.
 #
 # Report bugs to <ejabberd@process-one.net>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ejabberd'
 PACKAGE_TARNAME='ejabberd'
-PACKAGE_VERSION='community 13.12-100-gec6c58a'
-PACKAGE_STRING='ejabberd community 13.12-100-gec6c58a'
+PACKAGE_VERSION='community 13.12-119-g47a39ce'
+PACKAGE_STRING='ejabberd community 13.12-119-g47a39ce'
 PACKAGE_BUGREPORT='ejabberd@process-one.net'
 PACKAGE_URL=''
 
@@ -561,7 +561,6 @@ ac_default_prefix=/
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 tools
-sip
 lager
 http
 debug
@@ -673,7 +672,6 @@ enable_iconv
 enable_debug
 enable_http
 enable_lager
-enable_sip
 enable_user
 '
       ac_precious_vars='build_alias
@@ -1224,7 +1222,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-100-gec6c58a to adapt to many kinds of systems.
+\`configure' configures ejabberd community 13.12-119-g47a39ce to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1285,7 +1283,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ejabberd community 13.12-100-gec6c58a:";;
+     short | recursive ) echo "Configuration of ejabberd community 13.12-119-g47a39ce:";;
    esac
   cat <<\_ACEOF
 
@@ -1311,8 +1309,8 @@ Optional Features:
                           --enable-pgsql --enable-pam --enable-zlib
                           --enable-stun --enable-riak --enable-json
                           --enable-iconv --enable-debug --enable-http
-                          --enable-lager --enable-sip --enable-tools (useful
-                          for Dialyzer checks, default: no)
+                          --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)
@@ -1329,7 +1327,6 @@ Optional Features:
   --enable-http           build external HTTP libraries ('ibrowse' and
                           'lhttpc', default: no)
   --enable-lager          enable lager support (default: yes)
-  --enable-sip            enable SIP support (default: no)
   --enable-user[[[=USER]]]
                           allow this system user to start ejabberd (default:
                           no)
@@ -1410,7 +1407,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ejabberd configure community 13.12-100-gec6c58a
+ejabberd configure community 13.12-119-g47a39ce
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1469,7 +1466,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-100-gec6c58a, which was
+It was created by ejabberd $as_me community 13.12-119-g47a39ce, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2869,8 +2866,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 sip=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 sip=false tools=false ;;
+  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 ;;
   *) as_fn_error $? "bad value ${enableval} for --enable-all" "$LINENO" 5  ;;
 esac
 fi
@@ -3032,18 +3029,6 @@ else
 fi
 
 
-# Check whether --enable-sip was given.
-if test "${enable_sip+set}" = set; then :
-  enableval=$enable_sip; case "${enableval}" in
-  yes) sip=true ;;
-  no)  sip=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-sip" "$LINENO" 5  ;;
-esac
-else
-  if test "x$sip" = "x"; then sip=false; fi
-fi
-
-
 ac_config_files="$ac_config_files Makefile vars.config src/ejabberd.app.src"
 
 
@@ -3876,7 +3861,6 @@ fi
 
 
 
-
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4420,7 +4404,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-100-gec6c58a, which was
+This file was extended by ejabberd $as_me community 13.12-119-g47a39ce, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4473,7 +4457,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-100-gec6c58a
+ejabberd config.status community 13.12-119-g47a39ce
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 6cb0580f904646c05bdc044fdc2ad9c770da0293..853d91ecb7ef4e7f337e4a8e99726354763c13c8 100644 (file)
--- 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-sip --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-stun --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 sip=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 sip=false tools=false ;;
+  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 ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -217,14 +217,6 @@ AC_ARG_ENABLE(lager,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-lager) ;;
 esac],[if test "x$lager" = "x"; then lager=true; fi])
 
-AC_ARG_ENABLE(sip,
-[AC_HELP_STRING([--enable-sip], [enable SIP support (default: no)])],
-[case "${enableval}" in
-  yes) sip=true ;;
-  no)  sip=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sip) ;;
-esac],[if test "x$sip" = "x"; then sip=false; fi])
-
 AC_CONFIG_FILES([Makefile
                 vars.config
                 src/ejabberd.app.src])
@@ -285,7 +277,6 @@ AC_SUBST(iconv)
 AC_SUBST(debug)
 AC_SUBST(http)
 AC_SUBST(lager)
-AC_SUBST(sip)
 AC_SUBST(tools)
 
 AC_OUTPUT

diff --git a/doc/guide.tex b/doc/guide.tex
index 488ab6a3de1eb2f898c810a32d083fc20ed57954..774e0ec724c8671a2501e4fb68d3c448ce40eb77 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -397,9 +397,6 @@ Some options that you may be interested in modifying:
         \titem{--enable-zlib}
         Enable Stream Compression (XEP-0138) using zlib.
 
-        \titem{--enable-sip}
-        Enable SIP support (see section \ref{sip}).
-
         \titem{--enable-stun}
         Enable STUN support (see section \ref{stun}).
 

diff --git a/rebar.config.script b/rebar.config.script
index dc68d1d30c0c6f2e9227b21cc143d739c7339192..f6772e0e8ab9c808c14e53cbd204912733bede4d 100644 (file)
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -43,13 +43,8 @@ HiPE = case lists:keysearch(hipe, 1, Cfg) of
        end,
 
 Includes = [{i, "include"},
-            {i, filename:join(["deps", "p1_xml", "include"])}|
-           lists:flatmap(
-             fun({sip, true}) ->
-                     [{i, filename:join(["deps", "esip", "include"])}];
-                (_) ->
-                     []
-             end, Cfg)],
+           {i, filename:join(["deps", "esip", "include"])},
+            {i, filename:join(["deps", "p1_xml", "include"])}],
 
 SrcDirs = lists:foldl(
             fun({tools, true}, Acc) ->
@@ -62,6 +57,7 @@ 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"}},
+       {esip, ".*", {git, "git://github.com/processone/p1_sip"}},
         {p1_yaml, ".*", {git, "git://github.com/processone/p1_yaml"}},
         {xmlrpc, ".*", {git, "git://github.com/rds13/xmlrpc"}}],
 
@@ -83,6 +79,7 @@ XMLFlags = lists:foldl(
 PostHooks = [ConfigureCmd("p1_tls", ""),
              ConfigureCmd("p1_stringprep", ""),
              ConfigureCmd("p1_yaml", ""),
+            ConfigureCmd("esip", ""),
              ConfigureCmd("p1_xml", XMLFlags)],
 
 CfgDeps = lists:flatmap(
@@ -103,8 +100,6 @@ CfgDeps = lists:flatmap(
                ({http, true}) ->
                     [{ibrowse, ".*", {git, "git://github.com/cmullaparthi/ibrowse"}},
                      {lhttpc, ".*", {git, "git://github.com/esl/lhttpc"}}];
-              ({sip, true}) ->
-                   [{esip, ".*", {git, "git://github.com/processone/p1_sip"}}];
                ({lager, true}) ->
                     [{lager, ".*", {git, "git://github.com/basho/lager"}}];
                ({lager, false}) ->
@@ -120,8 +115,6 @@ CfgPostHooks = lists:flatmap(
                          [ConfigureCmd("p1_zlib", "")];
                     ({iconv, true}) ->
                          [ConfigureCmd("p1_iconv", "")];
-                   ({sip, true}) ->
-                        [ConfigureCmd("esip", "")];
                     (_) ->
                          []
                  end, Cfg),

diff --git a/vars.config.in b/vars.config.in
index 037af96bca7e7d9907327acb8d82341347945ffd..31c356fc9604e38f34f1b01f900f80620283f031 100644 (file)
--- a/vars.config.in
+++ b/vars.config.in
@@ -28,7 +28,6 @@
 {json, @json@}.
 {http, @http@}.
 {lager, @lager@}.
-{sip, @sip@}.
 {iconv, @iconv@}.
 
 %% Version