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

wez             Tue Jul 26 23:22:04 2005 EDT

  Modified files:              
    /pecl/pdo_odbc      config.m4 package.xml pdo_odbc.c 
  Log:
  prep for pecl release
  
  
http://cvs.php.net/diff.php/pecl/pdo_odbc/config.m4?r1=1.21&r2=1.22&ty=u
Index: pecl/pdo_odbc/config.m4
diff -u pecl/pdo_odbc/config.m4:1.21 pecl/pdo_odbc/config.m4:1.22
--- pecl/pdo_odbc/config.m4:1.21        Thu Jul  7 09:42:12 2005
+++ pecl/pdo_odbc/config.m4     Tue Jul 26 23:22:02 2005
@@ -1,19 +1,24 @@
-dnl $Id: config.m4,v 1.21 2005/07/07 13:42:12 wez Exp $
+dnl $Id: config.m4,v 1.22 2005/07/27 03:22:02 wez Exp $
 dnl config.m4 for extension pdo_odbc
 dnl vim:et:sw=2:ts=2:
 
 if test "$PHP_PDO" != "no"; then
 
 define([PDO_ODBC_HELP_TEXT],[[
-                            include and lib dirs are looked under 'dir'.
+                            include and lib dirs are looked for under 'dir'.
+                            
                             'flavour' can be one of:  ibm-db2, unixODBC, 
generic
                             If ',dir' part is omitted, default for the flavour 
                             you have selected will used. e.g.:
+                            
                               --with-pdo-odbc=unixODBC
+                              
                             will check for unixODBC under /usr/local. You may 
attempt 
                             to use an otherwise unsupported driver using the 
\"generic\" 
                             flavour.  The syntax for generic ODBC support is:
+                            
                               
--with-pdo-odbc=generic,dir,libname,ldflags,cflags
+
                             This extension will always be created as a shared 
extension
                             named pdo_odbc.so]])
 
@@ -23,15 +28,34 @@
 
 
 AC_DEFUN([PDO_ODBC_CHECK_HEADER],[
+  AC_MSG_CHECKING([for $1 in $PDO_ODBC_INCDIR])
   if test -f "$PDO_ODBC_INCDIR/$1"; then
     php_pdo_have_header=yes
-    PHP_DEF_HAVE($1)
+    PHP_DEF_HAVE(translit($1,.,_))
+    AC_MSG_RESULT(yes)
+  else
+    AC_MSG_RESULT(no)
   fi
 ])
                                   
 if test "$PHP_PDO_ODBC" != "no"; then
 
-  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)
+  ])
 
   AC_MSG_CHECKING([for selected PDO ODBC flavour])
 
@@ -136,7 +160,10 @@
 
   PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, 
$ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE)
   PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
-  PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
+  ifdef([PHP_ADD_EXTENDION_DEP],
+  [
+    PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
+  ])
 fi
 
 fi
http://cvs.php.net/diff.php/pecl/pdo_odbc/package.xml?r1=1.4&r2=1.5&ty=u
Index: pecl/pdo_odbc/package.xml
diff -u pecl/pdo_odbc/package.xml:1.4 pecl/pdo_odbc/package.xml:1.5
--- pecl/pdo_odbc/package.xml:1.4       Wed Feb  9 00:03:59 2005
+++ pecl/pdo_odbc/package.xml   Tue Jul 26 23:22:03 2005
@@ -21,8 +21,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.
@@ -46,7 +46,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_odbc/pdo_odbc.c?r1=1.13&r2=1.14&ty=u
Index: pecl/pdo_odbc/pdo_odbc.c
diff -u pecl/pdo_odbc/pdo_odbc.c:1.13 pecl/pdo_odbc/pdo_odbc.c:1.14
--- pecl/pdo_odbc/pdo_odbc.c:1.13       Thu Jul  7 08:49:21 2005
+++ pecl/pdo_odbc/pdo_odbc.c    Tue Jul 26 23:22:03 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_odbc.c,v 1.13 2005/07/07 12:49:21 wez Exp $ */
+/* $Id: pdo_odbc.c,v 1.14 2005/07/27 03:22:03 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,16 +37,22 @@
 /* }}} */
 
 /* {{{ pdo_odbc_deps[] */
+#if ZEND_EXTENSION_API_NO >= 220050617
 static zend_module_dep pdo_odbc_deps[] = {
        ZEND_MOD_REQUIRED("pdo")
        {NULL, NULL, NULL}
 };
+#endif
 /* }}} */
 
 /* {{{ pdo_odbc_module_entry */
 zend_module_entry pdo_odbc_module_entry = {
+#if ZEND_EXTENSION_API_NO >= 220050617
        STANDARD_MODULE_HEADER_EX, NULL,
        pdo_odbc_deps,
+#else
+       STANDARD_MODULE_HEADER,
+#endif
        "PDO_ODBC",
        pdo_odbc_functions,
        PHP_MINIT(pdo_odbc),
@@ -54,7 +60,7 @@
        NULL,
        NULL,
        PHP_MINFO(pdo_odbc),
-       "0.2",
+       "0.9",
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */