svn commit: r735842 - in /couchdb/trunk: README configure.ac

[ns...@apache.org]

Author: nslater
Date: Mon Jan 19 13:52:36 2009
New Revision: 735842

URL: http://svn.apache.org/viewvc?rev=735842&view=rev
Log:
tweeked version checking for erlang

Modified:
    couchdb/trunk/README
    couchdb/trunk/configure.ac

Modified: couchdb/trunk/README
URL: http://svn.apache.org/viewvc/couchdb/trunk/README?rev=735842&r1=735841&r2=735842&view=diff
==============================================================================
--- couchdb/trunk/README (original)
+++ couchdb/trunk/README Mon Jan 19 13:52:36 2009
@@ -59,7 +59,7 @@
 
 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 @@
  * 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
 ++++++++++++++++++++++++++++++++++
 

Modified: couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=735842&r1=735841&r2=735842&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Mon Jan 19 13:52:36 2009
@@ -127,7 +127,7 @@
     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 @@
     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