cvs: pecl /pdo_oci config.m4 package.xml pdo_oci.c

wez             Tue Jul 26 23:48:09 2005 EDT

  Modified files:              
    /pecl/pdo_oci       config.m4 package.xml pdo_oci.c 
  Log:
  Add support for instant client 10.1.0.4.
  Theoretically also add support for 10.2 libraries.
  Prep for PECL release.
  
  
http://cvs.php.net/diff.php/pecl/pdo_oci/config.m4?r1=1.13&r2=1.14&ty=u
Index: pecl/pdo_oci/config.m4
diff -u pecl/pdo_oci/config.m4:1.13 pecl/pdo_oci/config.m4:1.14
--- pecl/pdo_oci/config.m4:1.13 Mon Jun 13 20:00:53 2005
+++ pecl/pdo_oci/config.m4      Tue Jul 26 23:48:08 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.13 2005/06/14 00:00:53 sniper Exp $
+dnl $Id: config.m4,v 1.14 2005/07/27 03:48:08 wez Exp $
 
 if test "$PHP_PDO" != "no"; then
 
@@ -54,7 +54,16 @@
   if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
     PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
     PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
-    PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client)
+    AC_MSG_CHECKING([for oci.h])
+    if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h 
; then
+      
PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client)
+      AC_MSG_RESULT($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client)
+    elif test -f 
$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then
+      
PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include)
+      
AC_MSG_RESULT($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include)
+    else
+      AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in 
your instant client install])
+    fi
     PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
     PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
   else
@@ -74,6 +83,10 @@
       PHP_ADD_INCLUDE($PDO_OCI_DIR/plsql/public)
       PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/plsql/public"
     fi
+    if test -d "$PDO_OCI_DIR/include"; then
+      PHP_ADD_INCLUDE($PDO_OCI_DIR/include)
+      PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/include"
+    fi
 
     if test -f "$PDO_OCI_DIR/lib/sysliblist"; then
       PHP_EVAL_LIBLINE(`cat $PDO_OCI_DIR/lib/sysliblist`, PDO_OCI_SYSLIB)
@@ -103,6 +116,9 @@
     10.1)
       PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
       ;;
+    10.2)
+      PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
+      ;;
     *)
       AC_MSG_ERROR(Unsupported Oracle version! $PDO_OCI_VERSION)
       ;;
@@ -160,14 +176,33 @@
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   ])
 
-  PHP_CHECK_PDO_INCLUDES
+  ifdef([PHP_CHECK_PDO_INCLUDES],
+  [
+    PHP_CHECK_PDO_INCLUDES
+  ],[
+    AC_MSG_CHECKING([for PDO includes])
+    if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+      pdo_inc_path=$abs_srcdir/ext
+    elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+      pdo_inc_path=$abs_srcdir/ext
+    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+      pdo_inc_path=$prefix/include/php/ext
+    else
+      AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+    fi
+    AC_MSG_RESULT($pdo_inc_path)
+  ])
 
   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)
   PHP_SUBST_OLD(PDO_OCI_VERSION)
-  PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
+
+  ifdef([PHP_ADD_EXTENDION_DEP],
+  [
+    PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
+  ])
   
 fi
 
http://cvs.php.net/diff.php/pecl/pdo_oci/package.xml?r1=1.3&r2=1.4&ty=u
Index: pecl/pdo_oci/package.xml
diff -u pecl/pdo_oci/package.xml:1.3 pecl/pdo_oci/package.xml:1.4
--- pecl/pdo_oci/package.xml:1.3        Wed Feb  9 00:03:07 2005
+++ pecl/pdo_oci/package.xml    Tue Jul 26 23:48:08 2005
@@ -17,8 +17,8 @@
  <license>PHP</license>
  <release>
   <state>beta</state>
-  <version>0.2</version>
-  <date>2005-02-09</date>
+  <version>0.9</version>
+  <date>2005-07-27</date>
 
   <notes>
    You need to install the PDO core module before you can make use of this one.
@@ -41,7 +41,7 @@
   </filelist>
   <deps>
    <dep type="php" rel="ge" version="5.0.3"/>
-   <dep type="ext" rel="ge" name="pdo" version="0.2"/>
+   <dep type="ext" rel="ge" name="pdo" version="0.9"/>
   </deps>
  </release>
 </package>
http://cvs.php.net/diff.php/pecl/pdo_oci/pdo_oci.c?r1=1.4&r2=1.5&ty=u
Index: pecl/pdo_oci/pdo_oci.c
diff -u pecl/pdo_oci/pdo_oci.c:1.4 pecl/pdo_oci/pdo_oci.c:1.5
--- pecl/pdo_oci/pdo_oci.c:1.4  Wed Feb  9 00:03:07 2005
+++ pecl/pdo_oci/pdo_oci.c      Tue Jul 26 23:48:08 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_oci.c,v 1.4 2005/02/09 05:03:07 wez Exp $ */
+/* $Id: pdo_oci.c,v 1.5 2005/07/27 03:48:08 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,8 +37,21 @@
 /* }}} */
 
 /* {{{ pdo_oci_module_entry */
+
+#if ZEND_EXTENSION_API_NO >= 220050617
+static zend_module_dep pdo_oci_deps[] = {
+       ZEND_MOD_REQUIRED("pdo")
+       {NULL, NULL, NULL}
+};
+#endif
+
 zend_module_entry pdo_oci_module_entry = {
+#if ZEND_EXTENSION_API_NO >= 220050617
+       STANDARD_MODULE_HEADER_EX, NULL,
+       pdo_oci_deps,
+#else
        STANDARD_MODULE_HEADER,
+#endif
        "PDO_OCI",
        pdo_oci_functions,
        PHP_MINIT(pdo_oci),
@@ -46,7 +59,7 @@
        NULL,
        NULL,
        PHP_MINFO(pdo_oci),
-       "0.2",
+       "0.9",
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */