aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-05-19 09:20:35 +0000
committerBadlop <badlop@process-one.net>2008-05-19 09:20:35 +0000
commit30f54a6bfcf4db9df0611a16fd54bb7c2fa09d64 (patch)
tree0968138ec79954dc7ad976ba7531047ebd5dea13
parent* doc/guide.tex: Describe how to disable registration (diff)
* src/configure.ac: R12 support: remove compilation
warning (EJAB-630) * src/configure: Likewise * doc/guide.tex: Likewise SVN Revision: 1334
-rw-r--r--ChangeLog5
-rw-r--r--doc/guide.tex2
-rwxr-xr-xsrc/configure9
-rw-r--r--src/configure.ac9
4 files changed, 6 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 901c55c6a..9b86825e9 100644
--- 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 c5256a8a3..b3614cebc 100644
--- 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 39fe6b559..b874f6cab 100755
--- 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 bc89e67e9..a3e8894e9 100644
--- 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