diff options
| author | Paul Joseph Davis <davisp@apache.org> | 2009-08-16 02:37:57 +0000 |
|---|---|---|
| committer | Paul Joseph Davis <davisp@apache.org> | 2009-08-16 02:37:57 +0000 |
| commit | 3975b8758a6aa58389a74eba15e1908ef86465d8 (patch) | |
| tree | 7ff4a242ce27b12c43e103afb15d1169bb07504c /configure.ac | |
| parent | 165531bcf223f1c05c4c2eaef7cd2f2943c10584 (diff) | |
Update our Erlang VM requirement to 5.6.5 (R12B5). Also fixes the remaining two
compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@804552 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 35fd3de1..c7b766f2 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,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.0 (R12B)." +erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)." version="`${ERL} -version 2>&1 | ${SED} "s/[[^0-9]]/ /g"`" @@ -160,6 +160,12 @@ if test `echo $version | ${AWK} "{print \\$2}"` -lt 6; 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 + AC_MSG_ERROR([$erlang_version_error]) + fi +fi + AC_PATH_PROG([ERLC], [erlc]) if test x${ERLC} = x; then |