diff options
| -rw-r--r-- | INSTALL.Unix | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/couchdb/couch_app.erl | 3 | ||||
| -rw-r--r-- | src/erlang-oauth/Makefile.am | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/INSTALL.Unix b/INSTALL.Unix index 768e3846..720134d4 100644 --- a/INSTALL.Unix +++ b/INSTALL.Unix @@ -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/) diff --git a/configure.ac b/configure.ac index b776a258..0cc277a4 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,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.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"`" @@ -249,12 +249,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 3; then AC_MSG_ERROR([$erlang_version_error]) fi fi diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl index 232953d9..c16412a3 100644 --- a/src/couchdb/couch_app.erl +++ b/src/couchdb/couch_app.erl @@ -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. diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am index 48b76482..76239484 100644 --- a/src/erlang-oauth/Makefile.am +++ b/src/erlang-oauth/Makefile.am @@ -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 |