From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Thu, 13 Aug 2015 11:06:05 +0000 (+0200)
Subject: configure.ac: Don't insist on Erlang/OTP >= 17.5
X-Git-Tag: 15.09~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3efd0ebc5acff8ff59aecd919b3e193be2edae8c;p=ejabberd

configure.ac: Don't insist on Erlang/OTP >= 17.5

The current ejabberd code works on Erlang/OTP 17.1 or newer.  We now
also let Travis CI test this version in addition to 17.5.
---

diff --git a/.travis.yml b/.travis.yml
index c058d82a3..a60bb3ac2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: erlang
 
 otp_release:
-  - 17.4
+  - 17.1
+  - 17.5
 
 services:
   - riak
diff --git a/README b/README
index 884a29057..f03c194a7 100644
--- a/README
+++ b/README
@@ -106,7 +106,7 @@ To compile ejabberd you need:
  - GCC.
  - Libexpat 1.95 or higher.
  - Libyaml 0.1.4 or higher.
- - Erlang/OTP R17 or higher.
+ - Erlang/OTP 17.1 or higher.
  - OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
  - Zlib 1.2.3 or higher, for Stream Compression support (XEP-0138). Optional.
  - PAM library. Optional. For Pluggable Authentication Modules (PAM).
diff --git a/configure.ac b/configure.ac
index 564bc03d5..d7842be3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.53)
 AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
-REQUIRE_ERLANG_MIN="6.4 (Erlang/OTP R17)"
+REQUIRE_ERLANG_MIN="6.1 (Erlang/OTP 17.1)"
 REQUIRE_ERLANG_MAX="9.0.0 (No Max)"
 
 AC_CONFIG_MACRO_DIR([m4])