aboutsummaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-02-16 00:54:08 +0100
committerRickard Green <[email protected]>2014-02-19 15:30:44 +0100
commit3fd4e3e770fbed95fd6fa2d547945ac71256339c (patch)
treea856f741c5d307d4e56334b650740d7e22073cbf /configure.in
parenta37ea8849ab29cb8d15ab3bc5a3ba1fc16dd0276 (diff)
downloadotp-3fd4e3e770fbed95fd6fa2d547945ac71256339c.tar.gz
otp-3fd4e3e770fbed95fd6fa2d547945ac71256339c.tar.bz2
otp-3fd4e3e770fbed95fd6fa2d547945ac71256339c.zip
Misc adjustments of OTP version
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in12
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]))