diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-01 19:09:15 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-01 19:09:15 +0000 |
| commit | 75937acbafe06a927eb82bab6f2b244be60800c3 (patch) | |
| tree | 663c0147183080d1bec9c7d20a293f3252a99a3f /ext/pdo_oci/config.w32 | |
| parent | a2a18797c0dd6aaea9952fd881f6ac791ac0df1c (diff) | |
| download | php-git-75937acbafe06a927eb82bab6f2b244be60800c3.tar.gz | |
- fix EOL broken by previous commit
Diffstat (limited to 'ext/pdo_oci/config.w32')
| -rwxr-xr-x | ext/pdo_oci/config.w32 | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/ext/pdo_oci/config.w32 b/ext/pdo_oci/config.w32 index 3fa74aa6d1..0edf885c01 100755 --- a/ext/pdo_oci/config.w32 +++ b/ext/pdo_oci/config.w32 @@ -1,91 +1,46 @@ // $Id$ - // vim:ft=javascript - - ARG_WITH("pdo-oci", "Oracle OCI support for PDO", "no"); - - if (PHP_PDO_OCI != "no") { - - pdo_oci_dirs = new Array( - PHP_PDO_OCI, - PHP_PDO_OCI + "\\oci", - PHP_PHP_BUILD + "\\instantclient10_*\\sdk", - PHP_PHP_BUILD + "\\oci92" - ); - - pdo_oci_lib_paths = ""; - pdo_oci_inc_paths = ""; - - // find the oracle install - for (i = 0; i < pdo_oci_dirs.length; i++) { - pdo_oci_lib_paths += pdo_oci_dirs[i] + "\\lib;"; - pdo_oci_lib_paths += pdo_oci_dirs[i] + "\\lib\\msvc;"; - pdo_oci_inc_paths += pdo_oci_dirs[i] + "\\include;"; - } - - pdo_oci_inc_paths += PHP_PHP_BUILD + "\\include\\instantclient;" - pdo_oci_lib_paths += PHP_PHP_BUILD + "\\lib\\instantclient;"; - - pdo_oci_header = CHECK_HEADER_ADD_INCLUDE("oci.h", "CFLAGS_PDO_OCI", pdo_oci_inc_paths, null, null, true); - - if (pdo_oci_header && CHECK_LIB("oci.lib", "pdo_oci", pdo_oci_lib_paths)) { - - pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header); - - EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c'); - - /* probe for some functions not present in older versions */ - pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header); - CHECK_FUNC_IN_HEADER('oci.h', 'OCIEnvCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI'); - CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI'); - CHECK_FUNC_IN_HEADER('ociap.h', 'OCIEnvNlsCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI'); - - } else { - WARNING("pdo-oci not enabled; libraries and headers not found"); - } - ADD_EXTENSION_DEP('pdo_oci', 'pdo'); - } |