diff options
| author | Jan Lehnardt <jan@apache.org> | 2013-08-01 17:57:36 +0200 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2013-10-03 16:08:35 +0200 |
| commit | 98683d906b4fa447c30ad9b69f9ad555173e74b9 (patch) | |
| tree | 70176b521cde21f70e9a0407b378ef2a5bac7049 /configure.ac | |
| parent | 0f5aa11280b0abcaea0f5090d125d192dd72d136 (diff) | |
| download | couchdb-98683d906b4fa447c30ad9b69f9ad555173e74b9.tar.gz | |
teach `couch-config` `--erlang-version`
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index bb3ef3832..9b980fb6f 100644 --- a/configure.ac +++ b/configure.ac @@ -123,6 +123,7 @@ else fi AC_PATH_PROG([ERL], [erl]) +AC_PATH_PROG([ESCRIPT], [escript]) AS_IF([test x${ERL} = x], [ AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?]) @@ -650,6 +651,9 @@ else fi fi +ERL_VERSION_COMMAND="${ESCRIPT} bin/erlang-version.escript" +erlangversion=`${ERL_VERSION_COMMAND}` + AC_ARG_VAR([ERL], [path to the `erl' executable]) AC_ARG_VAR([ERLC], [path to the `erlc' executable]) @@ -688,6 +692,8 @@ AC_SUBST([locallibdir], [${libdir}/${package_identifier}]) AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}]) AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}]) AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}]) +AC_SUBST([erlangversion], [${erlangversion}]) + # On Windows we install directly into our erlang distribution. if test x${IS_WINDOWS} = xTRUE; then |