pajoye Sun Jun 22 23:15:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build confutils.js
Log:
- return true/false when a dep addition was succeeded or not
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.14&r2=1.60.2.1.2.8.2.15&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.14
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.15
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.14 Sun Jun 22 20:51:57 2008
+++ php-src/win32/build/confutils.js Sun Jun 22 23:15:54 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.14 2008/06/22 20:51:57 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.15 2008/06/22 23:15:54 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1052,7 +1052,7 @@
if (optional) {
if (dep_present == "no")
- return;
+ return false;
}
var ext_shared = eval("PHP_" + EXT + "_SHARED");
@@ -1060,7 +1060,7 @@
if (dep_shared) {
if (!ext_shared) {
if (optional) {
- return;
+ return false;
}
ERROR("static " + extname + " cannot depend on shared "
+ dependson);
}
@@ -1071,11 +1071,14 @@
if (dep_present == "no") {
if (ext_shared) {
WARNING(extname + " has a missing dependency: "
+ dependson);
+ return false;
} else {
ERROR("Cannot build " + extname + "; " +
dependson + " not enabled");
+ return false;
}
}
- } // dependency is statically built-in to PHP
+ } // dependency is statically built-in to PHP
+ return true;
}
function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
