diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | win/configure.js | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 57061f44151..daf18ed3b3a 100644 --- a/configure.in +++ b/configure.in @@ -13,6 +13,8 @@ AC_CANONICAL_SYSTEM # # When merging new MySQL releases, update the version number to match the # 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_CONFIG_HEADER([include/config.h:config.h.in]) diff --git a/win/configure.js b/win/configure.js index be30dc7f9d9..2f6ecbe3d0e 100644 --- a/win/configure.js +++ b/win/configure.js @@ -156,7 +156,10 @@ function GetValue(str, key) function GetVersion(str) { var key = "AM_INIT_AUTOMAKE(mysql, "; + var key2 = "AM_INIT_AUTOMAKE(mariadb, "; var pos = str.indexOf(key); //5.0.6-beta) + if (pos == -1) + pos = str.indexOf(key2); if (pos == -1) return null; pos += key.length; var end = str.indexOf(")", pos); |