diff options
| author | Edin Kadribasic <edink@php.net> | 2003-12-05 01:03:35 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2003-12-05 01:03:35 +0000 |
| commit | 32eb4f78c2f761b1f1c89aa82c057ee62590b10e (patch) | |
| tree | 051f1a5d1069e50a7f6161f825f1f8a3174035ca /ext/pgsql/config.w32 | |
| parent | 6abf2179c1d3c17ffe64072678935481d76f67ab (diff) | |
| download | php-git-32eb4f78c2f761b1f1c89aa82c057ee62590b10e.tar.gz | |
Get rid of PHPAPI usage.
Enable shared build in the new php5 build system
Check for the correct header.
Diffstat (limited to 'ext/pgsql/config.w32')
| -rw-r--r-- | ext/pgsql/config.w32 | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ext/pgsql/config.w32 b/ext/pgsql/config.w32 index 624533d152..c66959d302 100644 --- a/ext/pgsql/config.w32 +++ b/ext/pgsql/config.w32 @@ -4,16 +4,12 @@ ARG_WITH("pgsql", "PostgreSQL support", "no"); if (PHP_PGSQL != "no") { - if (!PHP_PGSQL_SHARED) { - ERROR("Cannot build pgsql as a static extension until someone fixes its bogus PHPAPI usage\r\nuse --with-pgsql=shared instead."); + if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) && + CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PGSQL", PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PGSQL)) { + EXTENSION("pgsql", "pgsql.c"); + AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library'); + ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS"); } else { - if (CHECK_LIB("libpq.lib", "pgsql", PHP_PGSQL) && - CHECK_HEADER_ADD_INCLUDE("postgres.h", "CFLAGS_PGSQL", PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\postgresql\\src\\include;" + PHP_PGSQL)) { - EXTENSION("pgsql", "pgsql.c"); - AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library'); - ADD_FLAG("CFLAGS_PGSQL", "/D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PG_CONFIG_H"); - } else { - WARNING("pgsql not enabled; libraries and headers not found"); - } + WARNING("pgsql not enabled; libraries and headers not found"); } } |