diff options
| author | Wez Furlong <wez@php.net> | 2003-12-19 20:39:04 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-19 20:39:04 +0000 |
| commit | 331dc79254566ee777f6af7be9232f1f647c9474 (patch) | |
| tree | f25e5af5c67ee72d46bbb4c1b0cea445365f50be /sapi/nsapi | |
| parent | 7930ddce0af10a22a180e9549049086c9ff6d8b4 (diff) | |
| download | php-git-331dc79254566ee777f6af7be9232f1f647c9474.tar.gz | |
More things for the new build system.
Pi3Web and aolserver build untested (no headers and libs for those here)
Diffstat (limited to 'sapi/nsapi')
| -rw-r--r-- | sapi/nsapi/config.w32 | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sapi/nsapi/config.w32 b/sapi/nsapi/config.w32 index cb5357513c..0a04c4fef5 100644 --- a/sapi/nsapi/config.w32 +++ b/sapi/nsapi/config.w32 @@ -7,20 +7,14 @@ ARG_WITH('nsapi-includes', 'Where to find NSAPI headers', null); ARG_WITH('nsapi-libs', 'Where to find NSAPI libraries', null); if (PHP_NSAPI != "no") { - if (PHP_ZTS == "no") { - ERROR("NSAPI module requires an --enable-zts build of PHP"); - } - - if (!CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI", - PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES)) { - ERROR("Could not find NSAPI headers"); - } - - if (!CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib", + WARNING("NSAPI module requires an --enable-zts build of PHP"); + } else if (CHECK_HEADER_ADD_INCLUDE("nsapi.h", "CFLAGS_NSAPI", + PHP_NSAPI + ';' + PHP_NSAPI_INCLUDES) && + CHECK_LIB("ns-httpd40.lib;ns-httpd36.lib;ns-httpd35.lib;ns-httpd30.lib", "nsapi", PHP_NSAPI + ";" + PHP_NSAPI_LIBS)) { - ERROR("Could not find NSAPI libraries"); + SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D XP_WIN32 '); + } else { + WARNING("Could not find NSAPI headers/libraries"); } - - SAPI('nsapi', 'nsapi.c', 'php' + PHP_VERSION + 'nsapi.dll', '/D XP_WIN32 '); } |