diff options
| author | Noah Slater <nslater@apache.org> | 2009-01-19 21:52:36 +0000 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2009-01-19 21:52:36 +0000 |
| commit | 55e61d341f4c73b7c50ca6bca151d86d1f5f43f5 (patch) | |
| tree | 3802c5e89366f32c3b65749bf6aa7c382282b7a5 | |
| parent | e18359140f647a67874b2cfff5cf71980a2ca2f2 (diff) | |
tweeked version checking for erlang
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@735842 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -59,7 +59,7 @@ Dependencies To build and install apache CouchDB you will need the following installed: - * Erlang OTP (>=R12B-4) (http://erlang.org/) + * Erlang OTP (>=R12B) (http://erlang.org/) * ICU (http://icu.sourceforge.net/) * OpenSSL (http://www.openssl.org/) * Mozilla SpiderMonkey (http://www.mozilla.org/js/spidermonkey/) @@ -67,6 +67,8 @@ To build and install apache CouchDB you will need the following installed: * GNU Make (http://www.gnu.org/software/make/) * GNU Compiler Collection (http://gcc.gnu.org/) +It is recommended that you install Erlang OTP R12B-4 or above where possible. + Debian-based (inc. Ubuntu) Systems ++++++++++++++++++++++++++++++++++ diff --git a/configure.ac b/configure.ac index 9004a28e..b30aa8fe 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ if test x${ERL} = x; then AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?]) fi -erlang_version_error="The installed Erlang version is less than 5.5.0 (R11B)." +erlang_version_error="The installed Erlang version is less than 5.6.0 (R12B)." version="`${ERL} -version 2>&1 | ${SED} "s/[[^0-9]]/ /g"`" @@ -135,7 +135,7 @@ if test `echo $version | ${AWK} "{print \\$1}"` -lt 5; then AC_MSG_ERROR([$erlang_version_error]) fi -if test `echo $version | ${AWK} "{print \\$2}"` -lt 5; then +if test `echo $version | ${AWK} "{print \\$2}"` -lt 6; then AC_MSG_ERROR([$erlang_version_error]) fi |