Repository: couchdb Updated Branches: refs/heads/2200-feature-support-erlang-17.0 [created] 1ee4acad6
build: detect new erlang version format correctly - OTP 17.0 uses a different numbering system for releases and patches, but not semver.org - the major version number will be bumped for the first time in 4 years Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1ee4acad Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1ee4acad Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1ee4acad Branch: refs/heads/2200-feature-support-erlang-17.0 Commit: 1ee4acad6f970a965776711769e14b7a0e392ab4 Parents: 0e33059 Author: Dave Cottlehuber <[email protected]> Authored: Thu Mar 13 10:27:29 2014 +0100 Committer: Dave Cottlehuber <[email protected]> Committed: Thu Mar 13 10:40:10 2014 +0100 ---------------------------------------------------------------------- configure.ac | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/1ee4acad/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 57a4268..6a04f68 100644 --- a/configure.ac +++ b/configure.ac @@ -411,19 +411,20 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5 $as_echo_n "checking Erlang version compatibility... " >&6; } -erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and <R17 (erts-5.11)" +erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and <R17 (erts-6.0)" version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0" major_version=`echo $version | ${AWK} "{print \\$1}"` minor_version=`echo $version | ${AWK} "{print \\$2}"` patch_version=`echo $version | ${AWK} "{print \\$3}"` +echo "detected Erlang version: $major_version.$minor_version.$patch_version" -if test $major_version -ne 5; then - as_fn_error $? "$erlang_version_error" "$LINENO" 5 +if test $major_version -lt 5 -o $major_version -gt 6; then + as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 fi -if test $minor_version -lt 8 -o $minor_version -gt 10; then - as_fn_error $? "$erlang_version_error" "$LINENO" 5 +if test $major_version -eq 5 a $minor_version -lt 8; then + as_fn_error $? "$erlang_version_error minor_version does not match" "$LINENO" 5 fi AC_MSG_RESULT(compatible)
