Merge pull request #483

Author: jmikola

config.w32

@@ -15,7 +15,7 @@ function mongodb_generate_header(inpath, outpath, replacements)
       replacement = replacement.replace(/"/g, '\\"');
     }
 
-    outdata = outdata.replace("@" + key + "@", replacement);
+    outdata = outdata.replace(new RegExp('@' + key + '@', 'g'), replacement);
   }
 
   var outfile = FSO.CreateTextFile(outpath, true);
@@ -31,13 +31,14 @@ function mongodb_parse_version_file(inpath, prefix)
 
   var xyz_pre = version.split("-");
   var xyz = xyz_pre[0].split(".");
+  var pre = xyz_pre.length > 1 ? xyz_pre[1] : "";
 
   var replacements = {};
   replacements[prefix + "VERSION"] = version;
   replacements[prefix + "MAJOR_VERSION"] = xyz[0];
   replacements[prefix + "MINOR_VERSION"] = xyz[1];
   replacements[prefix + "MICRO_VERSION"] = xyz[2];
-  replacements[prefix + "PRERELEASE_VERSION"] = xyz_pre[1];
+  replacements[prefix + "PRERELEASE_VERSION"] = pre;
 
   return replacements;
 }
@@ -46,10 +47,10 @@ ARG_ENABLE("mongodb", "MongoDB support", "no");
 ARG_WITH("mongodb-sasl", "MongoDB: Build against Cyrus-SASL", "yes");
 
 if (PHP_MONGODB != "no") {
-  ADD_EXTENSION_DEP("mongodb", "date", false);
+  /* Note: ADD_EXTENSION_DEP() cannot be used to declare that we depend on the
+   * date and standard extensions. Assume that they're always enabled. */
   ADD_EXTENSION_DEP("mongodb", "json", false);
   ADD_EXTENSION_DEP("mongodb", "spl", false);
-  ADD_EXTENSION_DEP("mongodb", "standard", false);
 
   /* MongoDB does not actually depend on PHP's OpenSSL extension, but this is in
    * place to ensure that later SSL library checks succeed. This can be removed