At file:///home/psergey/bzr-new/maria-5.1-build1/
------------------------------------------------------------
revno: 2766
revision-id: psergey@askmonty.org-20091007210029-bxfk4r2xo0128uhq
parent: psergey@askmonty.org-20091007172636-oan0ue1yxk41bza1
committer: Sergey Petrunya
branch nick: maria-5.1-build1
timestamp: Thu 2009-10-08 01:00:29 +0400
message:
Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...)
- Part 2. make it really work.
=== modified file 'win/configure.js'
--- a/win/configure.js 2009-10-07 17:26:36 +0000
+++ b/win/configure.js 2009-10-07 21:00:29 +0000
@@ -157,11 +157,15 @@
{
var key = "AM_INIT_AUTOMAKE(mysql, ";
var key2 = "AM_INIT_AUTOMAKE(mariadb, ";
+ var key_len = key.length;
var pos = str.indexOf(key); //5.0.6-beta)
if (pos == -1)
+ {
pos = str.indexOf(key2);
+ key_len= key2.length;
+ }
if (pos == -1) return null;
- pos += key.length;
+ pos += key_len;
var end = str.indexOf(")", pos);
if (end == -1) return null;
return str.substring(pos, end);
