cvs: php-src /ext/pdo_oci config.w32

pajoye Fri Aug 1 19:09:15 2008 UTC Modified files: /php-src/ext/pdo_oci config.w32 Log: - fix EOL broken by previous commit http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.w32?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/pdo_oci/config.w32 diff -u php-src/ext/pdo_oci/config.w32:1.8 php-src/ext/pdo_oci/config.w32:1.9 --- php-src/ext/pdo_oci/config.w32:1.8 Fri Aug 1 18:58:15 2008 +++ php-src/ext/pdo_oci/config.w32 Fri Aug 1 19:09:15 2008 @@ -1 +1,46 @@ -// $Id: config.w32,v 1.8 2008/08/01 18:58:15 pajoye Exp $// vim:ft=javascriptARG_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');} \ No newline at end of file +// $Id: config.w32,v 1.9 2008/08/01 19:09:15 pajoye Exp $ +// 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'); +}