diff options
| author | Rickard Green <[email protected]> | 2014-02-21 11:34:29 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-02-21 11:34:29 +0100 |
| commit | dd298cc2d6b21e8c387ac525bd678f0dfa8853f3 (patch) | |
| tree | e59914298c52fec7fb00234eb4f22517367f3a44 /configure.in | |
| parent | 986611be9b5050969a58e8bdce864b0eb91133d5 (diff) | |
| parent | 3fd4e3e770fbed95fd6fa2d547945ac71256339c (diff) | |
| download | otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.gz otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.bz2 otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.zip | |
Merge branch 'rickard/otp_version/OTP-11615'
* rickard/otp_version/OTP-11615:
Misc adjustments of OTP version
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 88fd847030..081febd47b 100644 --- a/configure.in +++ b/configure.in @@ -180,18 +180,26 @@ AC_PROG_LN_S AC_PROG_RANLIB # -# Get erts version and otp release from erts/vsn.mk +# Get erts version from erts/vsn.mk # AC_MSG_CHECKING([ERTS version]) [ERTS_VSN=`sed -n "s/^VSN[ ]*=[ ]*\(.*\)/\1/p" < $ERL_TOP/erts/vsn.mk`] AC_MSG_RESULT([$ERTS_VSN]) AC_SUBST(ERTS_VSN) +# +# Get OTP release and OTP version from $ERL_TOP/OTP_VERSION +# AC_MSG_CHECKING([OTP release]) -[OTP_REL=`sed -n "s/^SYSTEM_VSN[ ]*=[ ]*\(.*\)/\1/p" < $ERL_TOP/erts/vsn.mk`] +[OTP_REL=`cat $ERL_TOP/OTP_VERSION | sed "s|\([0-9]*\).*|\1|"`] AC_MSG_RESULT([$OTP_REL]) AC_SUBST(OTP_REL) +AC_MSG_CHECKING([OTP version]) +[OTP_VSN=`cat $ERL_TOP/OTP_VERSION`] +AC_MSG_RESULT([$OTP_VSN]) +AC_SUBST(OTP_VSN) + AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], [enable async thread support]) AS_HELP_STRING([--disable-threads], [disable async thread support])) |