* src/configure.ac: R12 support: remove compilation

warning (EJAB-630)
* src/configure: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1334

diff --git a/ChangeLog b/ChangeLog
index 901c55c6a9f6cdfbca61246f181b90c3eb600675..9b86825e98f93582e4a7ecbee46216fdad449c54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-05-19  Badlop  <badlop@process-one.net>
 
+       * src/configure.ac: R12 support: remove compilation
+       warning (EJAB-630)
+       * src/configure: Likewise
+       * doc/guide.tex: Likewise
+
        * doc/guide.tex: Describe how to disable registration
        limitation (EJAB-614)
 

diff --git a/doc/guide.tex b/doc/guide.tex
index c5256a8a3cc09eb0b82dfbde9869865dc1737cd5..b3614cebc73e3759ee015442631d84527ba3650f 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -264,7 +264,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need:
 \item GNU Make
 \item GCC
 \item Libexpat 1.95 or higher
-\item Erlang/OTP R10B-9 up to R11B-5. Erlang R12 releases are not yet officially supported, and are not recommended for production servers.
+\item Erlang/OTP R10B-9 or newer.
 \item OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended.
 \item Zlib 1.2.3 or higher, for Stream Compression support (\xepref{0138}). Optional.
 \item GNU Iconv 1.8 or higher, for the IRC Transport (mod\_irc). Optional. Not needed on systems with GNU Libc.

diff --git a/src/configure b/src/configure
index 39fe6b55963f9c4f0aec19dd9ec798230afcced5..b874f6cabb274c92a50b692fcaf1c6ff5d65d7af 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -6910,12 +6910,3 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-
-if test -n "$ERLANG_SSL39" ; then
-       echo
-       echo "**************** WARNING ! ********************"
-       echo "ejabberd will be compiled with Erlang R12."
-       echo "This version of Erlang is not supported"
-       echo "and not recommended for production servers"
-       echo "***********************************************"
-fi

diff --git a/src/configure.ac b/src/configure.ac
index bc89e67e9c4f3782b1989d85580f55b42072799d..a3e8894e9ffed4f06300f6bef99a5b13bba05a35 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -120,12 +120,3 @@ fi
 AC_CHECK_HEADER(krb5.h,,)
 
 AC_OUTPUT
-
-if test -n "$ERLANG_SSL39" ; then
-       echo
-       echo "**************** WARNING ! ********************"
-       echo "ejabberd will be compiled with Erlang R12."
-       echo "This version of Erlang is not supported"
-       echo "and not recommended for production servers"
-       echo "***********************************************"
-fi