At file:///home/psergey/bzr-new/maria-5.1-build2/ ------------------------------------------------------------ revno: 2765 revision-id: psergey@askmonty.org-20091007172636-oan0ue1yxk41bza1 parent: psergey@askmonty.org-20091007165611-nah5830oiz64lbnw committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.1-build2 timestamp: Wed 2009-10-07 21:26:36 +0400 message: Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...) === modified file 'configure.in' --- a/configure.in 2009-10-07 11:48:58 +0000 +++ b/configure.in 2009-10-07 17:26:36 +0000 @@ -13,6 +13,8 @@ # # 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]) === modified file 'win/configure.js' --- a/win/configure.js 2009-09-07 20:50:10 +0000 +++ b/win/configure.js 2009-10-07 17:26:36 +0000 @@ -156,7 +156,10 @@ 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);