diff options
| author | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-05-14 03:13:17 +0000 |
|---|---|---|
| committer | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-05-14 03:13:17 +0000 |
| commit | 7d4dfa8ee42105a1248c2189a88435ab5fdfc520 (patch) | |
| tree | 791b4ea52cebaaab7d43ebd837d1cef57104771a /win32 | |
| parent | 6552d917430e6fa3009e17925985595f6f49c635 (diff) | |
| download | php-git-7d4dfa8ee42105a1248c2189a88435ab5fdfc520.tar.gz | |
Windows configure fixes, a few additional lib names allowed, apache2 only on for zts builds since apache on win is always threaded, isapi no longer stops configure in non-zts mode, look for _debug for debug libraries when debug is enabled
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index b47bc66aca..c9f236fa90 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.8.2.10 2008-04-14 17:55:02 sfox Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8.2.11 2008-05-14 03:13:17 auroraeosrose Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -586,6 +586,17 @@ function CHECK_LIB(libnames, target, path_to_check, common_name) // libnames can be ; separated list of accepted library names libnames = libnames.split(';'); + // for debug builds, lib may have _debug appended, we want that first + if (PHP_DEBUG == "yes") { + var length = libnames.length; + for (var i = 0; i < length; i++) { + var name = new String(libnames[i]); + rExp = /.lib$/i; + name = name.replace(rExp,"_debug.lib"); + libnames.unshift(name); + } + } + var i, j, k, libname; var location = false; var path = path_to_check.split(';'); |