diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-08-13 13:06:05 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-08-13 13:06:05 +0200 |
| commit | 3efd0ebc5acff8ff59aecd919b3e193be2edae8c (patch) | |
| tree | ec8d6fd50111b21d8fb0456eecf9adb226e1efae | |
| parent | Prettify copyright links (thanks to GreenLunar)(#692) (diff) | |
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.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index c058d82a..a60bb3ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: erlang otp_release: - - 17.4 + - 17.1 + - 17.5 services: - riak @@ -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 564bc03d..d7842be3 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]) |