diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2008-02-26 18:18:03 +0100 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2008-02-26 18:18:03 +0100 |
| commit | ff25b925431efde1b032b26f13a893c25128d789 (patch) | |
| tree | f935ee8ca9ec36da10095f604dc4f1d86d5213c1 /configure.in | |
| parent | 0c98586bc80e9cde1d165f01895d9b7d47375eb9 (diff) | |
| download | mariadb-git-ff25b925431efde1b032b26f13a893c25128d789.tar.gz | |
configure.in:
Corrected calculation of version id, incorrect last two digits if < 10
Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
RPM spec file
Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
Added clear doc how the different version variables differ
SocketServer.cpp:
Corrected typo in debug error message
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 1643426f827..a0fe8ac5f8b 100644 --- a/configure.in +++ b/configure.in @@ -26,9 +26,19 @@ NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? # Remember that regexps needs to quote [ and ] since this is run through m4 -MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"` -MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"` -MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION. | sed -e 's/[[^0-9.]]//g; s/\./ /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'` +# We take some made up examples +# +# VERSION 5.1.40sp1-alpha 5.0.34a +# MYSQL_NO_DASH_VERSION 5.1.40sp1 5.0.34a +# MYSQL_NUMERIC_VERSION 5.1.40 5.0.34 +# MYSQL_BASE_VERSION 5.1 5.0 +# MYSQL_VERSION_ID 50140 50034 +# +MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"` +MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"` +MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"` +MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \ + awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'` # The port should be constant for a LONG time MYSQL_TCP_PORT_DEFAULT=3306 |