diff options
author | Jan Lehnardt <jan@apache.org> | 2017-10-31 21:23:10 +0100 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2017-10-31 21:23:10 +0100 |
commit | a2183f60e9027a7cf5caabecc0b645eb3754e7c4 (patch) | |
tree | e797dccacb3f0b90c1076fa790ca9f67a36556dd | |
parent | a4d13432a4f11f09981a459e31edbe31756b7c7d (diff) | |
download | couchdb-a2183f60e9027a7cf5caabecc0b645eb3754e7c4.tar.gz |
enable R20 builds
-rw-r--r-- | configure.ac | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 27ac813c2..cf165ad48 100644 --- a/configure.ac +++ b/configure.ac @@ -415,7 +415,7 @@ 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 =< 19 (erts-8.0)" +erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 20 (erts-9)" version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0" major_version=`echo $version | ${AWK} "{print \\$1}"` @@ -423,11 +423,11 @@ minor_version=`echo $version | ${AWK} "{print \\$2}"` patch_version=`echo $version | ${AWK} "{print \\$3}"` echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..." -if test $major_version -lt 5 -o $major_version -gt 8; then +if test $major_version -lt 5 -o $major_version -gt 9; then as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 fi -if test $major_version -eq 5 -a $minor_version -lt 8; then +if test $major_version -eq 5 -a $minor_version -lt 9; then as_fn_error $? "$erlang_version_error minor_version does not match" "$LINENO" 5 fi @@ -442,9 +442,9 @@ otp_release="`\ AC_SUBST(otp_release) AM_CONDITIONAL([USE_OTP_NIFS], - [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)")]) + [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19|20)")]) AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], - [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)")]) + [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19|20)")]) has_crypto=`\ ${ERL} -eval "\ @@ -453,7 +453,7 @@ has_crypto=`\ if test -n "$has_crypto"; then AC_MSG_ERROR([Could not find the Erlang crypto library. - + Has Erlang been compiled with OpenSSL support?]) fi @@ -461,7 +461,7 @@ AC_PATH_PROG([ERLC], [erlc]) if test x${ERLC} = x; then AC_MSG_ERROR([Could not find the `erlc' executable. - + Is Erlang installed?]) fi @@ -574,7 +574,7 @@ AC_CHECK_PROG([HAS_PDFLATEX], [pdflatex], [yes]) if test x${HAS_PDFLATEX} = x; then if test x${strictness_enabled} = xyes; then AC_MSG_ERROR([Could not find the `pdflatex' executable. - + Is LaTeX installed?]) else AC_MSG_WARN([You will be unable to regenerate PDF documentation.]) @@ -586,7 +586,7 @@ AC_CHECK_PROG([HAS_MAKEINFO], [makeinfo], [yes]) if test x${HAS_MAKEINFO} = x; then if test x${strictness_enabled} = xyes; then AC_MSG_ERROR([Could not find the `makeinfo' executable. - + Is GNU Texinfo installed?]) else AC_MSG_WARN([You will be unable to regenerate info documentation.]) @@ -598,7 +598,7 @@ AC_CHECK_PROG([HAS_INSTALLINFO], [install-info], [yes]) if test x${HAS_INSTALLINFO} = x; then if test x${strictness_enabled} = xyes; then AC_MSG_ERROR([Could not find the `install-info' executable. - + Is GNU Texinfo installed?]) else AC_MSG_WARN([You will be unable to install info documentation.]) |