diff options
| author | Wez Furlong <wez@php.net> | 2003-12-03 14:29:45 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-03 14:29:45 +0000 |
| commit | ad84dfa9375a64d8521484600ffe7df15e58a083 (patch) | |
| tree | 375b15b20d86c13e5046d2b16e457589b15cd408 /ext | |
| parent | f7a86e5b5e73753b43804947108f9a1677f74e00 (diff) | |
| download | php-git-ad84dfa9375a64d8521484600ffe7df15e58a083.tar.gz | |
Build adjustments.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/libxml/config.w32 | 7 | ||||
| -rw-r--r-- | ext/mssql/config.w32 | 14 | ||||
| -rw-r--r-- | ext/sqlite/config.w32 | 4 |
3 files changed, 15 insertions, 10 deletions
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32 index 5641e6f097..cd296dd7a3 100644 --- a/ext/libxml/config.w32 +++ b/ext/libxml/config.w32 @@ -7,9 +7,10 @@ if (PHP_LIBXML == "yes") { EXTENSION("libxml", "libxml.c", false /* never shared */); AC_DEFINE("HAVE_LIBXML", 1, "LibXML support"); - CHECK_LIB("iconv.lib", "libxml", php_usual_lib_suspects); - CHECK_LIB("libxml2.lib", "libxml", php_usual_lib_suspects); - CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS", php_usual_include_suspects); + CHECK_LIB("iconv.lib", "libxml"); + CHECK_LIB("libxml2.lib", "libxml"); + CHECK_HEADER_ADD_INCLUDE("libxml/parser.h", "CFLAGS"); + ADD_FLAG("CFLAGS", "/D LIBXML_THREAD_ENABLED"); } diff --git a/ext/mssql/config.w32 b/ext/mssql/config.w32 index 28de4e2b64..8d3d4e54d1 100644 --- a/ext/mssql/config.w32 +++ b/ext/mssql/config.w32 @@ -4,10 +4,12 @@ ARG_WITH("mssql", "mssql support", "no"); if (PHP_MSSQL == "yes") { - EXTENSION("mssql", "php_mssql.c"); - CHECK_LIB("ntwdblib.lib", "mssql", "\\MSSQL7\\DevTools\\Lib"); - CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS"); - AC_DEFINE('DBNTWIN32', 1, ''); - AC_DEFINE('MSSQL70', 1, ''); - AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support'); + if (CHECK_LIB("ntwdblib.lib", "mssql", "\\MSSQL7\\DevTools\\Lib") && + CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_MSSQL")) { + EXTENSION("mssql", "php_mssql.c"); + ADD_FLAG("CFLAGS_MSSQL", "/D DBNTWIN32=1 /D MSSQL70=1"); + AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support'); + } else { + WARNING("mssql not enabled; libraries and headers not found"); + } } diff --git a/ext/sqlite/config.w32 b/ext/sqlite/config.w32 index 140b8d3d65..093c951bb0 100644 --- a/ext/sqlite/config.w32 +++ b/ext/sqlite/config.w32 @@ -20,7 +20,9 @@ if (PHP_SQLITE == "yes") { copy.c where.c trigger.c", "sqlite"); AC_DEFINE("HAVE_SQLITE", 1, "SQLite support"); - ADD_DEF_FILE("ext\\sqlite\\php_sqlite.def"); + if (!PHP_SQLITE_SHARED) { + ADD_DEF_FILE("ext\\sqlite\\php_sqlite.def"); + } } |