summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-10-08 01:00:29 +0400
committerSergey Petrunya <psergey@askmonty.org>2009-10-08 01:00:29 +0400
commitd1d978ddc401606ba3634c5440d17c5624d623d1 (patch)
tree015f935a4063cb87bf469dff10ad9532085f346a /win
parent56841aced4dbfd888ecb9f38e704919fe4f459b8 (diff)
downloadmariadb-git-d1d978ddc401606ba3634c5440d17c5624d623d1.tar.gz
Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...)
- Part 2. make it really work.
Diffstat (limited to 'win')
-rw-r--r--win/configure.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/win/configure.js b/win/configure.js
index 2f6ecbe3d0e..4cb9b9aeeb4 100644
--- a/win/configure.js
+++ b/win/configure.js
@@ -157,11 +157,15 @@ function GetVersion(str)
{
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);