diff options
| author | Edin Kadribasic <edink@php.net> | 2007-05-04 18:17:55 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2007-05-04 18:17:55 +0000 |
| commit | 567c9daeaeb4b6e059e88ca930d6f99d28c0739e (patch) | |
| tree | 6fa0cba5e6b4b568b5fe593a9e98ab067ad458d6 | |
| parent | b8fbcae5b304732ebc012e3e80afa7bb1f49279e (diff) | |
| download | php-git-567c9daeaeb4b6e059e88ca930d6f99d28c0739e.tar.gz | |
Update Apache 2 libs to 2.0.59 on the build box and standardize the dirs
| -rwxr-xr-x | sapi/apache2filter/config.w32 | 8 | ||||
| -rw-r--r-- | sapi/apache2handler/config.w32 | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sapi/apache2filter/config.w32 b/sapi/apache2filter/config.w32 index 9eeccbb1d9..9b26f9ef3f 100755 --- a/sapi/apache2filter/config.w32 +++ b/sapi/apache2filter/config.w32 @@ -4,10 +4,10 @@ ARG_ENABLE('apache2filter', 'Build Apache 2.x filter', 'no'); if (PHP_APACHE2FILTER != "no") { - if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\apache2\\include") && - CHECK_LIB("libhttpd.lib", "apache2filter", PHP_PHP_BUILD + "\\apache2\\lib") && - CHECK_LIB("libapr.lib", "apache2filter", PHP_PHP_BUILD + "\\apache2\\lib") && - CHECK_LIB("libaprutil.lib", "apache2filter", PHP_PHP_BUILD + "\\apache2\\lib") + if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2FILTER", PHP_PHP_BUILD + "\\include\\apache2") && + CHECK_LIB("libhttpd.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") && + CHECK_LIB("libapr.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") && + CHECK_LIB("libaprutil.lib", "apache2filter", PHP_PHP_BUILD + "\\lib\\apache2") ) { SAPI('apache2filter', 'sapi_apache2.c apache_config.c php_functions.c', 'php' + PHP_VERSION + 'apache2_filter.dll', diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index ab9863bceb..b9a27a196d 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -4,10 +4,10 @@ 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 + "\\apache2\\include") && - CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib") && - CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib") && - CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib") + 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") ) { SAPI('apache2handler', 'mod_php5.c sapi_apache2.c apache_config.c php_functions.c', 'php' + PHP_VERSION + 'apache2.dll', |