SIP support

Conflicts:
	configure
	configure.ac
	doc/guide.tex

2 files changed, 50 insertions, 17 deletions

diff --git a/configure b/configure
index 4114b2e6..e26d6e89 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.
+# Generated by GNU Autoconf 2.67 for ejabberd community 13.12-100-gec6c58a.
 #
 # 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'
-PACKAGE_STRING='ejabberd community'
+PACKAGE_VERSION='community 13.12-100-gec6c58a'
+PACKAGE_STRING='ejabberd community 13.12-100-gec6c58a'
 PACKAGE_BUGREPORT='ejabberd@process-one.net'
 PACKAGE_URL=''
 
@@ -561,6 +561,7 @@ ac_default_prefix=/
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 tools
+sip
 lager
 http
 debug
@@ -672,6 +673,7 @@ enable_iconv
 enable_debug
 enable_http
 enable_lager
+enable_sip
 enable_user
 '
       ac_precious_vars='build_alias
@@ -1222,7 +1224,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 to adapt to many kinds of systems.
+\`configure' configures ejabberd community 13.12-100-gec6c58a to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1283,7 +1285,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ejabberd community:";;
+     short | recursive ) echo "Configuration of ejabberd community 13.12-100-gec6c58a:";;
    esac
   cat <<\_ACEOF
 
@@ -1309,8 +1311,8 @@ Optional Features:
                           --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-lager --enable-sip --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)
@@ -1327,6 +1329,7 @@ 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)
@@ -1407,7 +1410,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ejabberd configure community
+ejabberd configure community 13.12-100-gec6c58a
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1466,7 +1469,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, which was
+It was created by ejabberd $as_me community 13.12-100-gec6c58a, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2480,7 +2483,7 @@ if test "${enable_erlang_version_check+set}" = set; then :
   enableval=$enable_erlang_version_check;
 fi
 
-	case "$enable_erlang_version_check" in
+case "$enable_erlang_version_check" in
 	yes|'')
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang/OTP version" >&5
 $as_echo_n "checking Erlang/OTP version... " >&6; }
@@ -2526,6 +2529,10 @@ parse(Version) ->
 
 less_or_equal([], []) ->
     true;
+less_or_equal([], _Any) ->
+    true;
+less_or_equal(_Any, []) ->
+    false;
 less_or_equal([Left| Rl], [Right| Rr]) ->
     case {Left < Right, Left == Right} of
         {true, _}  ->
@@ -2608,6 +2615,10 @@ parse(Version) ->
 
 less_or_equal([], []) ->
     true;
+less_or_equal([], _Any) ->
+    true;
+less_or_equal(_Any, []) ->
+    false;
 less_or_equal([Left| Rl], [Right| Rr]) ->
     case {Left < Right, Left == Right} of
         {true, _}  ->
@@ -2858,8 +2869,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 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 ;;
   *) as_fn_error $? "bad value ${enableval} for --enable-all" "$LINENO" 5  ;;
 esac
 fi
@@ -3021,6 +3032,18 @@ 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"
 
 
@@ -3854,6 +3877,7 @@ 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
@@ -4396,7 +4420,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, which was
+This file was extended by ejabberd $as_me community 13.12-100-gec6c58a, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4449,7 +4473,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
+ejabberd config.status community 13.12-100-gec6c58a
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 853d91ec..6cb0580f 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-stun --enable-riak --enable-json --enable-iconv --enable-debug --enable-http --enable-lager --enable-sip --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 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 ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -217,6 +217,14 @@ 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])
@@ -277,6 +285,7 @@ AC_SUBST(iconv)
 AC_SUBST(debug)
 AC_SUBST(http)
 AC_SUBST(lager)
+AC_SUBST(sip)
 AC_SUBST(tools)
 
 AC_OUTPUT