wez Fri Jan 9 06:19:41 2004 EDT
Modified files:
/php-src/win32/build confutils.js
Log:
fix PHP_SPL problem when you don't have a pecl checkout.
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.34 php-src/win32/build/confutils.js:1.35
--- php-src/win32/build/confutils.js:1.34 Thu Jan 8 16:53:48 2004
+++ php-src/win32/build/confutils.js Fri Jan 9 06:19:40 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.34 2004/01/08 21:53:48 wez Exp $
+// $Id: confutils.js,v 1.35 2004/01/09 11:19:40 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -792,15 +792,22 @@
{
var EXT = extname.toUpperCase();
var DEP = dependson.toUpperCase();
+ var dep_present = false;
+ var dep_shared = false;
+ try {
+ dep_present = eval("PHP_" + DEP);
+ dep_shared = eval("PHP_" + DEP + "_SHARED");
+ } catch (e) {
+ dep_present = "no";
+ dep_shared = false;
+ }
+
if (optional) {
- var dep_present = eval("PHP_" + DEP);
-
if (dep_present == "no")
return;
}
- var dep_shared = eval("PHP_" + DEP + "_SHARED");
var ext_shared = eval("PHP_" + EXT + "_SHARED");
if (dep_shared) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
