couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [1/2] git commit: Require Erlang R13B04 or later
Date Wed, 05 Dec 2012 23:06:05 GMT
Updated Branches:
  refs/heads/1.3.x ba74e8079 -> a60646324
  refs/heads/master 8e888858f -> c20240cb4


Require Erlang R13B04 or later


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a6064632
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a6064632
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a6064632

Branch: refs/heads/1.3.x
Commit: a606463249e75e9a6184447dec84ee26ed74bc0c
Parents: ba74e80
Author: Jan Lehnardt <jan@apache.org>
Authored: Thu Dec 6 00:05:46 2012 +0100
Committer: Jan Lehnardt <jan@apache.org>
Committed: Thu Dec 6 00:05:53 2012 +0100

----------------------------------------------------------------------
 INSTALL.Unix |    4 ++--
 configure.ac |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a6064632/INSTALL.Unix
----------------------------------------------------------------------
diff --git a/INSTALL.Unix b/INSTALL.Unix
index baf9d06..bd8c9d0 100644
--- a/INSTALL.Unix
+++ b/INSTALL.Unix
@@ -25,7 +25,7 @@ Dependencies
 
 You should have the following installed:
 
- * Erlang OTP (>=R12B5)       (http://erlang.org/)
+ * Erlang OTP (>=R13B04)      (http://erlang.org/)
  * ICU                        (http://icu.sourceforge.net/)
  * OpenSSL                    (http://www.openssl.org/)
  * Mozilla SpiderMonkey (1.7) (http://www.mozilla.org/js/spidermonkey/)
@@ -34,7 +34,7 @@ You should have the following installed:
  * libcurl                    (http://curl.haxx.se/libcurl/)
  * help2man                   (http://www.gnu.org/s/help2man/)
 
-It is recommended that you install Erlang OTP R12B-5 or above where possible.
+It is recommended that you install Erlang OTP R13B-4 or above where possible.
 You will only need libcurl if you plan to run the JavaScript test suite. And
 help2man is only need if you plan on installing the CouchDB man pages.
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a6064632/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 7ce4842..3c0e231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,7 +374,7 @@ case "$(uname -s)" in
 esac
 
 
-erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
+erlang_version_error="The installed Erlang version is less than 5.7.4 (R13B04)."
 
 version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'`"
 
@@ -382,12 +382,12 @@ 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 6; then
+if test `echo $version | ${AWK} "{print \\$2}"` -lt 7; then
     AC_MSG_ERROR([$erlang_version_error])
 fi
 
-if test `echo $version | ${AWK} "{print \\$2}"` -eq 6; then
-    if test `echo $version | ${AWK} "{print \\$3}"` -lt 5; then
+if test `echo $version | ${AWK} "{print \\$2}"` -eq 7; then
+    if test `echo $version | ${AWK} "{print \\$3}"` -lt 4; then
         AC_MSG_ERROR([$erlang_version_error])
     fi
 fi


Mime
View raw message