summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2003-12-23 16:01:41 +0000
committerWez Furlong <wez@php.net>2003-12-23 16:01:41 +0000
commit5d5f2619b35f87cf51ee33dc8c01d025a8dafecb (patch)
tree9f1c1c8e49725f17cd22f8525d7aee8b246b8d86 /win32
parent7aac9069d46c9df4ee2036da953f639e28b3fb4b (diff)
downloadphp-git-5d5f2619b35f87cf51ee33dc8c01d025a8dafecb.tar.gz
Proper check for resolv.lib
Diffstat (limited to 'win32')
-rw-r--r--win32/build/config.w329
1 files changed, 8 insertions, 1 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index d18b301e39..409906a73b 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -53,7 +53,7 @@ DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
// General libs
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
-DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib resolv.lib");
+DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib");
// Set some debug/release specific options
if (PHP_DEBUG == "yes") {
@@ -116,6 +116,12 @@ ARG_WITH('extra-libs', 'Extra library path to use when linking everything', '');
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()
{
@@ -165,6 +171,7 @@ function add_extra_dirs()
probe_basic_headers();
add_extra_dirs();
+CHECK_LIB("resolv.lib");
//DEFINE("PHP_BUILD", PHP_PHP_BUILD);