ejabberd 13 requires Erlang/OTP R15B or higher (EJAB-1630)

Fix documents and remove useless code.

1 files changed, 10 insertions, 22 deletions

diff --git a/src/configure b/src/configure
index 7b7066cb6..031a731e3 100755
--- a/src/configure
+++ b/src/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ejabberd 2.1.12.
+# Generated by GNU Autoconf 2.68 for ejabberd 13.03-beta2.
 #
 # Report bugs to <ejabberd@process-one.net>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ejabberd'
 PACKAGE_TARNAME='ejabberd'
-PACKAGE_VERSION='2.1.12'
-PACKAGE_STRING='ejabberd 2.1.12'
+PACKAGE_VERSION='13.03-beta2'
+PACKAGE_STRING='ejabberd 13.03-beta2'
 PACKAGE_BUGREPORT='ejabberd@process-one.net'
 PACKAGE_URL=''
 
@@ -657,7 +657,6 @@ EGREP
 GREP
 CPP
 LIBICONV
-ERLANG_SSLVER
 ERLANG_LIBS
 ERLANG_CFLAGS
 ERL
@@ -1288,7 +1287,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 2.1.12 to adapt to many kinds of systems.
+\`configure' configures ejabberd 13.03-beta2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1354,7 +1353,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ejabberd 2.1.12:";;
+     short | recursive ) echo "Configuration of ejabberd 13.03-beta2:";;
    esac
   cat <<\_ACEOF
 
@@ -1479,7 +1478,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ejabberd configure 2.1.12
+ejabberd configure 13.03-beta2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1823,7 +1822,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 2.1.12, which was
+It was created by ejabberd $as_me 13.03-beta2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3224,17 +3223,9 @@ start() ->
     EIDirS = code:lib_dir("erl_interface") ++ "\n",
     EILibS =  libpath("erl_interface") ++ "\n",
     RootDirS = code:root_dir() ++ "\n",
-    file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
+    file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
     halt().
 
-ssldef() ->
-   OTP = (catch erlang:system_info(otp_release)),
-   if
-	OTP >= "R14" -> "-DSSL40\n";
-	OTP >= "R12" -> "-DSSL39\n";
-        true -> "\n"
-   end.
-
 %% return physical architecture based on OS/Processor
 archname() ->
     ArchStr = erlang:system_info(system_architecture),
@@ -3282,8 +3273,6 @@ _EOF
    ERLANG_EI_DIR=`cat conftest.out | head -n 1`
    # Second line
    ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
-   # Third line
-   ERLANG_SSLVER=`cat conftest.out | head -n 3 | tail -n 1`
    # End line
    ERLANG_DIR=`cat conftest.out | tail -n 1`
 
@@ -3295,7 +3284,6 @@ _EOF
 
 
 
-
 #locating iconv
 
 
@@ -5690,7 +5678,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 2.1.12, which was
+This file was extended by ejabberd $as_me 13.03-beta2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5743,7 +5731,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 2.1.12
+ejabberd config.status 13.03-beta2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"