cvs: php-src /win32/build config.w32

From: Date: Tue, 23 Dec 2003 16:01:41 +0000
Subject: cvs: php-src /win32/build config.w32
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-25421@lists.php.net to get a copy of this message
wez Tue Dec 23 11:01:41 2003 EDT Modified files: /php-src/win32/build config.w32 Log: Proper check for resolv.lib Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.20 php-src/win32/build/config.w32:1.21 --- php-src/win32/build/config.w32:1.20 Tue Dec 23 07:40:41 2003 +++ php-src/win32/build/config.w32 Tue Dec 23 11:01:41 2003 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.20 2003/12/23 12:40:41 wez Exp $ +// $Id: config.w32,v 1.21 2003/12/23 16:01:41 wez Exp $ // "Master" config file; think of it as a configure.in // equivalent. @@ -53,7 +53,7 @@ // 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 @@ 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 @@ probe_basic_headers(); add_extra_dirs(); +CHECK_LIB("resolv.lib"); //DEFINE("PHP_BUILD", PHP_PHP_BUILD);

« previous php.cvs (#25421) next »