Commit 56841ace authored by Sergey Petrunya's avatar Sergey Petrunya

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

parent 9d58141c
...@@ -13,6 +13,8 @@ AC_CANONICAL_SYSTEM ...@@ -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])
......
...@@ -156,7 +156,10 @@ function GetValue(str, key) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment