cvs: pecl /pdo_dblib README config.m4 pdo_dblib.c

wez             Tue Jul 26 23:12:45 2005 EDT

  Modified files:              
    /pecl/pdo_dblib     README config.m4 pdo_dblib.c 
  Log:
  prep for PECL release
  
  
http://cvs.php.net/diff.php/pecl/pdo_dblib/README?r1=1.1&r2=1.2&ty=u
Index: pecl/pdo_dblib/README
diff -u pecl/pdo_dblib/README:1.1 pecl/pdo_dblib/README:1.2
--- pecl/pdo_dblib/README:1.1   Sun Jan 16 20:15:13 2005
+++ pecl/pdo_dblib/README       Tue Jul 26 23:12:43 2005
@@ -9,10 +9,6 @@
 the mssql libraries (and be named php_pdo_mssql.dll), or 'sybase' otherwise
 (php_pdo_sybase.dll)
 
-This extension should also compile and run under unix platforms, but I haven't
-written the config.m4 for that yet (volunteers welcome).
-
-
 If you want to try out the free "desktop" version of SQL Server, known as the 
MSDE, google to obtain the appropriate download link.  Here are some short tips 
on getting it running:
 
 - Download it and run it to extract it
http://cvs.php.net/diff.php/pecl/pdo_dblib/config.m4?r1=1.1&r2=1.2&ty=u
Index: pecl/pdo_dblib/config.m4
diff -u pecl/pdo_dblib/config.m4:1.1 pecl/pdo_dblib/config.m4:1.2
--- pecl/pdo_dblib/config.m4:1.1        Tue Jul 12 08:16:02 2005
+++ pecl/pdo_dblib/config.m4    Tue Jul 26 23:12:43 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.1 2005/07/12 12:16:02 wez Exp $
+dnl $Id: config.m4,v 1.2 2005/07/27 03:12:43 wez Exp $
 dnl
 
 if test "$PHP_PDO" != "no"; then
@@ -33,6 +33,10 @@
     fi
   fi  
 
+  if test "x$PHP_LIBDIR" = "x" ; then
+    PHP_LIBDIR=lib
+  fi
+
   if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! 
-r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
      AC_MSG_ERROR(Could not find 
$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
   fi
@@ -42,7 +46,23 @@
 
   PHP_ADD_INCLUDE($PDO_DBLIB_INCDIR)
   PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_DBLIB_LIBDIR, PDO_DBLIB_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)
+  ])
+
   PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
   PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, 
$ext_shared,,-I$pdo_inc_path $PDO_DBLIB_DEFS)
   AC_CHECK_LIB(dnet_stub, dnet_addr,
@@ -52,6 +72,11 @@
   AC_DEFINE(HAVE_PDO_DBLIB,1,[ ])
   AC_DEFINE(HAVE_FREETDS,1,[ ])
   PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
+
+  ifdef([PHP_ADD_EXTENDION_DEP],
+  [
+    PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
+  ])
 fi
 
 fi
http://cvs.php.net/diff.php/pecl/pdo_dblib/pdo_dblib.c?r1=1.8&r2=1.9&ty=u
Index: pecl/pdo_dblib/pdo_dblib.c
diff -u pecl/pdo_dblib/pdo_dblib.c:1.8 pecl/pdo_dblib/pdo_dblib.c:1.9
--- pecl/pdo_dblib/pdo_dblib.c:1.8      Wed Jul 20 01:27:27 2005
+++ pecl/pdo_dblib/pdo_dblib.c  Tue Jul 26 23:12:43 2005
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_dblib.c,v 1.8 2005/07/20 05:27:27 wez Exp $ */
+/* $Id: pdo_dblib.c,v 1.9 2005/07/27 03:12:43 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -38,8 +38,20 @@
        {NULL, NULL, NULL}
 };
 
+#if ZEND_EXTENSION_API_NO >= 220050617
+static zend_module_dep pdo_dblib_deps[] = {
+       ZEND_MOD_REQUIRED("pdo")
+       {NULL, NULL, NULL}
+};
+#endif
+
 zend_module_entry pdo_dblib_module_entry = {
+#if ZEND_EXTENSION_API_NO >= 220050617
+       STANDARD_MODULE_HEADER_EX, NULL,
+       pdo_dblib_deps,
+#else
        STANDARD_MODULE_HEADER,
+#endif
 #if PDO_DBLIB_IS_MSSQL
        "pdo_mssql",
 #elif defined(PHP_WIN32)
@@ -53,7 +65,7 @@
        NULL,
        PHP_RSHUTDOWN(pdo_dblib),
        PHP_MINFO(pdo_dblib),
-       "0.1-dev",
+       "0.9",
        STANDARD_MODULE_PROPERTIES
 };