summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-11-25 12:19:28 +0200
committerunknown <monty@mashka.mysql.fi>2002-11-25 12:19:28 +0200
commit0985653c1f820badb4ab642fe8e9f1287fd20656 (patch)
treeaf2db8bb2a2a932f016529fbf7508121528d132a /configure.in
parent895e3dbbf831cfc6698f1f1f57586224351458b7 (diff)
parentbe5d04e8fced4176ec705b1188a6075e1253d9ca (diff)
downloadmariadb-git-0985653c1f820badb4ab642fe8e9f1287fd20656.tar.gz
Merge with 4.0
configure.in: Auto merged BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/func_test.result: Auto merged mysql-test/r/null_key.result: Auto merged mysql-test/t/func_test.test: Auto merged sql/handler.cc: Auto merged sql/item_create.cc: Auto merged sql/item_timefunc.h: Auto merged sql/lex.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/item_func.h: Merge
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 2ac8e050ae5..d25041dea7a 100644
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,7 @@ SHARED_LIB_VERSION=12:0:0
# 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|-.*$||"`
+MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`
F_PART=`echo $MYSQL_BASE_VERSION | sed -e "s|\.||g"| sed -e "s|[a-zA-Z]\+||"|sed -e "s|^\(..\)$|\\10|"`
L_PART=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|^[[0-9]]\.[[0-9]]*\.||" | sed -e "s|^\(.\)$|0\\1|" | sed -e "s|[[a-z]]||"`