From 7d4dfa8ee42105a1248c2189a88435ab5fdfc520 Mon Sep 17 00:00:00 2001 From: Elizabeth Marie Smith Date: Wed, 14 May 2008 03:13:17 +0000 Subject: 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 --- sapi/apache2handler/config.w32 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sapi/apache2handler') diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index b9a27a196d..2f2084cb14 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -4,7 +4,9 @@ ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no'); if (PHP_APACHE2HANDLER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") @@ -20,7 +22,9 @@ if (PHP_APACHE2HANDLER != "no") { ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no'); if (PHP_APACHE2_2HANDLER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && + if (PHP_ZTS == "no") { + WARNING("Apache2 module requires an --enable-zts build of PHP on windows"); + } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && CHECK_LIB("libhttpd.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && CHECK_LIB("libaprutil-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") -- cgit v1.2.1