From: Antony Dovgal Date: Mon, 14 Feb 2005 12:52:34 +0000 (+0000) Subject: fix indentation and add check for PDO includes X-Git-Tag: RELEASE_0_2_4~52 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff23184893436576f74ff6263cbb573f8bf8bfc5;p=php fix indentation and add check for PDO includes --- diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 8b768294b3..043d0cccf2 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -27,12 +27,10 @@ AC_DEFUN([AC_PDO_OCI_VERSION],[ PHP_ARG_WITH(pdo-oci, Oracle OCI support for PDO, [ - --with-pdo-oci[=DIR] Include Oracle-OCI support. Default DIR is ORACLE_HOME. - - You may also use --with-pdo-oci=instantclient,prefix,version to use - the InstantClient SDK. For Linux with 10.1.0.3 rpms (for example) use: - - --with-pdo-oci=instantclient,/usr,10.1.0.3 + --with-pdo-oci[=DIR] Include Oracle-OCI support. Default DIR is ORACLE_HOME. + You may also use --with-pdo-oci=instantclient,prefix,version to use + the InstantClient SDK. For Linux with 10.1.0.3 rpms (for example) use: + --with-pdo-oci=instantclient,/usr,10.1.0.3 ]) if test "$PHP_PDO_OCI" != "no"; then @@ -162,7 +160,17 @@ You need to tell me where to find your oracle SDK, or set ORACLE_HOME. -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD ]) - PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I\$prefix/include/php/ext) + if test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$prefix/include/php/ext + elif test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f ext/pdo/php_pdo_driver.h; then + pdo_inc_path=ext + else + AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) + fi + + PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c, $ext_shared,,-I$pdo_inc_path) PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD) PHP_SUBST_OLD(PDO_OCI_DIR)