| 1 | diff -ruN ../apache-couchdb-1.5.1.orig/configure ./configure |
| 2 | --- ../apache-couchdb-1.5.1.orig/configure 2014-03-27 09:34:13.000000000 -0500 |
| 3 | +++ ./configure 2014-04-19 23:02:23.000000000 -0500 |
| 4 | @@ -18556,24 +18556,26 @@ |
| 5 | |
| 6 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5 |
| 7 | $as_echo_n "checking Erlang version compatibility... " >&6; } |
| 8 | -erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and <R17 (erts-5.11)" |
| 9 | +erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)" |
| 10 | |
| 11 | version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0" |
| 12 | major_version=`echo $version | ${AWK} "{print \\$1}"` |
| 13 | minor_version=`echo $version | ${AWK} "{print \\$2}"` |
| 14 | patch_version=`echo $version | ${AWK} "{print \\$3}"` |
| 15 | +echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..." |
| 16 | |
| 17 | -if test $major_version -ne 5; then |
| 18 | - as_fn_error $? "$erlang_version_error" "$LINENO" 5 |
| 19 | +if test $major_version -lt 5 -o $major_version -gt 6; then |
| 20 | + as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 |
| 21 | fi |
| 22 | |
| 23 | -if test $minor_version -lt 8 -o $minor_version -gt 10; then |
| 24 | - as_fn_error $? "$erlang_version_error" "$LINENO" 5 |
| 25 | +if test $major_version -eq 5 -a $minor_version -lt 8; then |
| 26 | + as_fn_error $? "$erlang_version_error minor_version does not match" "$LINENO" 5 |
| 27 | fi |
| 28 | |
| 29 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: compatible" >&5 |
| 30 | $as_echo "compatible" >&6; } |
| 31 | |
| 32 | +# returns 17 for erts-6.0, and R14B03 or similar for earlier releases |
| 33 | otp_release="`\ |
| 34 | ${ERL} -noshell \ |
| 35 | -eval 'io:put_chars(erlang:system_info(otp_release)).' \ |
| 36 | @@ -18581,7 +18583,7 @@ |
| 37 | |
| 38 | |
| 39 | |
| 40 | - if test x$otp_release \> xR13B03; then |
| 41 | + if test $otp_release \> xR14B -o $otp_release -ge 17 ; then |
| 42 | USE_OTP_NIFS_TRUE= |
| 43 | USE_OTP_NIFS_FALSE='#' |
| 44 | else |
| 45 | @@ -18589,7 +18591,7 @@ |
| 46 | USE_OTP_NIFS_FALSE= |
| 47 | fi |
| 48 | |
| 49 | - if test x$otp_release \> xR14B03; then |
| 50 | + if test x$otp_release \> xR14B03 -o $otp_release -ge 17; then |
| 51 | USE_EJSON_COMPARE_NIF_TRUE= |
| 52 | USE_EJSON_COMPARE_NIF_FALSE='#' |
| 53 | else |