diff options
| author | Dave Cottlehuber <dch@apache.org> | 2015-06-26 10:31:27 +0200 |
|---|---|---|
| committer | Dave Cottlehuber <dch@apache.org> | 2015-06-26 12:01:26 +0200 |
| commit | 95cb436be30305efa091809813b64ef31af968c8 (patch) | |
| tree | 067458d2b292a94d86d7560c73e8964cc164c41b | |
| parent | 46f7b4e7e1e34f427b333fd97ddb02e475848607 (diff) | |
| download | couchdb-95cb436be30305efa091809813b64ef31af968c8.tar.gz | |
build: support OTP-18.0
| -rw-r--r-- | INSTALL.Unix | 2 | ||||
| -rw-r--r-- | INSTALL.Windows | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | share/doc/src/install/unix.rst | 2 | ||||
| -rw-r--r-- | share/doc/src/install/windows.rst | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/INSTALL.Unix b/INSTALL.Unix index f66f98cf0..4c63bc8e3 100644 --- a/INSTALL.Unix +++ b/INSTALL.Unix @@ -39,7 +39,7 @@ Dependencies You should have the following installed: - * Erlang OTP (>=R14B01, =<R17) (http://erlang.org/) + * Erlang OTP (>=R14B01, =<R18) (http://erlang.org/) * ICU (http://icu-project.org/) * OpenSSL (http://www.openssl.org/) * Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/) diff --git a/INSTALL.Windows b/INSTALL.Windows index 29c69b051..1ca04fd1e 100644 --- a/INSTALL.Windows +++ b/INSTALL.Windows @@ -29,7 +29,7 @@ Dependencies You will need the following installed: - * Erlang OTP (>=14B01, <R17) (http://erlang.org/) + * Erlang OTP (>=14B01, <R18) (http://erlang.org/) * ICU (>=4.*) (http://icu-project.org/) * OpenSSL (>=0.9.8r) (http://www.openssl.org/) * Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/) diff --git a/configure.ac b/configure.ac index 103f02999..bf9ffc444 100644 --- a/configure.ac +++ b/configure.ac @@ -411,7 +411,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5 $as_echo_n "checking Erlang version compatibility... " >&6; } -erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)" +erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)" version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0" major_version=`echo $version | ${AWK} "{print \\$1}"` @@ -419,7 +419,7 @@ minor_version=`echo $version | ${AWK} "{print \\$2}"` patch_version=`echo $version | ${AWK} "{print \\$3}"` echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..." -if test $major_version -lt 5 -o $major_version -gt 6; then +if test $major_version -lt 5 -o $major_version -gt 7; then as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 fi @@ -438,9 +438,9 @@ otp_release="`\ AC_SUBST(otp_release) AM_CONDITIONAL([USE_OTP_NIFS], - [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")]) + [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")]) AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], - [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")]) + [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")]) has_crypto=`\ ${ERL} -eval "\ diff --git a/share/doc/src/install/unix.rst b/share/doc/src/install/unix.rst index 76fe92257..904c128f5 100644 --- a/share/doc/src/install/unix.rst +++ b/share/doc/src/install/unix.rst @@ -52,7 +52,7 @@ Dependencies You should have the following installed: -* `Erlang OTP (>=R14B01, =<R17) <http://erlang.org/>`_ +* `Erlang OTP (>=R14B01, =<R18) <http://erlang.org/>`_ * `ICU <http://icu-project.org/>`_ * `OpenSSL <http://www.openssl.org/>`_ * `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_ diff --git a/share/doc/src/install/windows.rst b/share/doc/src/install/windows.rst index b7b66af0c..494ef6517 100644 --- a/share/doc/src/install/windows.rst +++ b/share/doc/src/install/windows.rst @@ -90,7 +90,7 @@ Dependencies You should have the following installed: -* `Erlang OTP (>=14B01, <R17) <http://erlang.org/>`_ +* `Erlang OTP (>=14B01, <R18) <http://erlang.org/>`_ * `ICU (>=4.*) <http://icu-project.org/>`_ * `OpenSSL (>0.9.8r) <http://www.openssl.org/>`_ * `Mozilla SpiderMonkey (=1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_ |