[PHP-CVS] cvs: php-src /win32/build config.w32 confutils.js

[Wez Furlong]

wez             Tue Dec 23 12:20:51 2003 EDT

  Modified files:              
    /php-src/win32/build        config.w32 confutils.js 
  Log:
  A more general check for dirs under Release or Debug.
  
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.21 php-src/win32/build/config.w32:1.22
--- php-src/win32/build/config.w32:1.21 Tue Dec 23 11:01:41 2003
+++ php-src/win32/build/config.w32      Tue Dec 23 12:20:50 2003
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.21 2003/12/23 16:01:41 wez Exp $
+// $Id: config.w32,v 1.22 2003/12/23 17:20:50 wez Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -116,12 +116,6 @@
 var php_usual_include_suspects = 
"..\\php_build\\include;..\\win32build\\include;..\\bindlib_w32";
 var php_usual_lib_suspects = "..\\php_build\\lib;..\\win32build\\lib;..\\bindlib_w32";
 
-if (PHP_DEBUG == "yes") {
-       php_usual_lib_suspects += ";..\\bindlib_w32\\Debug";
-} else {
-       php_usual_lib_suspects += ";..\\bindlib_w32\\Release";
-}
-
 // Poke around for some headers
 function probe_basic_headers()
 {
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.29 php-src/win32/build/confutils.js:1.30
--- php-src/win32/build/confutils.js:1.29       Tue Dec 23 08:10:54 2003
+++ php-src/win32/build/confutils.js    Tue Dec 23 12:20:50 2003
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-// $Id: confutils.js,v 1.29 2003/12/23 13:10:54 wez Exp $
+// $Id: confutils.js,v 1.30 2003/12/23 17:20:50 wez Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -463,7 +463,6 @@
        } else {
                target = "_" + target.toUpperCase();
        }
-
        
        if (path_to_check == null) {
                path_to_check = php_usual_lib_suspects;
@@ -475,11 +474,20 @@
        var i;
        var libname;
 
+       var subdir = PHP_DEBUG == "yes" ? "Debug" : "Release";
+
        libnames = libnames.split(';');
        for (i = 0; i < libnames.length; i++) {
                libname = libnames[i];
                p = search_paths(libname, path_to_check, "LIB");
 
+               if (!p) {
+                       p = search_paths(subdir + "\\" + libname, path_to_check, 
"LIB");
+                       if (p) {
+                               p += "\\" + subdir;
+                       }
+               }
+
                if (typeof(p) == "string") {
                        ADD_FLAG("LDFLAGS" + target, '/libpath:"' + p + '" ');
                        ADD_FLAG("LIBS" + target, libname);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php