1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...)

Browse Source
This commit is contained in:
Sergey Petrunya 2009-10-07 21:26:36 +04:00
parent 9d58141cdc
commit 56841aced4
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -13,6 +13,8 @@ AC_CANONICAL_SYSTEM
# #
# When merging new MySQL releases, update the version number to match the # When merging new MySQL releases, update the version number to match the
# MySQL version number, but reset the maria subrelease (m1). # MySQL version number, but reset the maria subrelease (m1).
#
# Note: the following line must be parseable by win/configure.js:GetVersion()
AM_INIT_AUTOMAKE(mariadb, 5.1.38m1-beta) AM_INIT_AUTOMAKE(mariadb, 5.1.38m1-beta)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])

3
win/configure.js
View File

@ -156,7 +156,10 @@ function GetValue(str, key)
function GetVersion(str) function GetVersion(str)
{ {
var key = "AM_INIT_AUTOMAKE(mysql, "; var key = "AM_INIT_AUTOMAKE(mysql, ";
var key2 = "AM_INIT_AUTOMAKE(mariadb, ";
var pos = str.indexOf(key); //5.0.6-beta) var pos = str.indexOf(key); //5.0.6-beta)
if (pos == -1)
pos = str.indexOf(key2);
if (pos == -1) return null; if (pos == -1) return null;
pos += key.length; pos += key.length;
var end = str.indexOf(")", pos); var end = str.indexOf(")", pos);