Skip to content

Commit

Permalink
bump minimum erlang to R13B02 (COUCHDB-1191)
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1133272 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
tilgovi committed Jun 8, 2011
1 parent cee8283 commit ea57780
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion INSTALL.Unix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Dependencies

You will need the following installed:

* Erlang OTP (>=R12B5) (http://erlang.org/)
* Erlang OTP (>=R13B2) (http://erlang.org/)
* ICU (http://icu.sourceforge.net/)
* OpenSSL (http://www.openssl.org/)
* Mozilla SpiderMonkey (1.8) (http://www.mozilla.org/js/spidermonkey/)
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -241,20 +241,20 @@ 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.6.5 (R12B05)."
erlang_version_error="The installed Erlang version is less than erts-5.7.3 (R13B02)."

version="`${ERL} -version 2>&1 | ${SED} "s/[[^0-9]]/ /g"`"

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 3; then
AC_MSG_ERROR([$erlang_version_error])
fi
fi
Expand Down
3 changes: 0 additions & 3 deletions src/couchdb/couch_app.erl
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ start_apps([App|Rest]) ->
start_apps(Rest);
{error, {already_started, App}} ->
start_apps(Rest);
{error, _Reason} when App =:= public_key ->
% ignore on R12B5
start_apps(Rest);
{error, _Reason} ->
{error, {app_would_not_start, App}}
end.
4 changes: 1 addition & 3 deletions src/erlang-oauth/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@ oauth_file_collection = \
oauth_unix.erl \
oauth_uri.erl

# Removed oauth_rsa_sha1.beam until we require R12B5 or
# we add a ./configure option to enable it.

oauthebin_make_generated_file_list = \
oauth.app \
oauth.beam \
oauth_hmac_sha1.beam \
oauth_http.beam \
oauth_plaintext.beam \
oauth_rsa_sha1.erl \
oauth_unix.beam \
oauth_uri.beam

Expand Down

0 comments on commit ea57780

Please sign in to comment.