Author: jschlueter
Date: 2008-04-22 16:45:10 +0200 (Tue, 22 Apr 2008)
New Revision: 1507
Added:
trunk/php5/ext/pdo_mysqlnd/php_pdo_mysql.h
trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h
Removed:
trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h
Modified:
trunk/php5/ext/pdo_mysqlnd/config.m4
Log:
stay with pdo_mysqlnd for some time
Modified: trunk/php5/ext/pdo_mysqlnd/config.m4
===================================================================
--- trunk/php5/ext/pdo_mysqlnd/config.m4 2008-04-22 14:13:27 UTC (rev 1506)
+++ trunk/php5/ext/pdo_mysqlnd/config.m4 2008-04-22 14:45:10 UTC (rev 1507)
@@ -2,8 +2,9 @@
dnl $Id: config.m4,v 1.25.2.7.2.6 2007/07/31 13:02:00 jani Exp $
dnl
-PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO via mysql,
-[ --with-pdo-mysql[=DIR] PDO: MySQL support via mysql. DIR is the MySQL
+dnl TODO Rename when moving to pdo_mysql
+PHP_ARG_WITH(pdo-mysqlnd, for MySQL support for PDO via mysqlnd,
+[ --with-pdo-mysqlnd[=DIR] PDO: MySQL support via mysql. DIR is the MySQL
base directory. If mysqlnd is passed as DIR,
the MySQL native driver will be used
[/usr/local]])
@@ -13,7 +14,10 @@
[ --with-zlib-dir[=DIR] PDO_MySQL: Set the path to libz install prefix], no, no)
fi
-if test "$PHP_PDO_MYSQLND" != "no"; then
+dnl Remove me after moving to pdo_mysql
+PHP_PDO_MYSQL=$PHP_PDO_MYSQLND
+
+if test "$PHP_PDO_MYSQL" != "no"; then
PHP_MYSQLND_ENABLED=yes
AC_DEFUN([PDO_MYSQL_LIB_CHK], [
@@ -28,7 +32,7 @@
if test "$PHP_PDO_MYSQL" = "mysqlnd"; then
dnl enables build of mysqnd library
- PHP_MYSQLND_ENABLED=yes
+ PHP_MYSQL_ENABLED=yes
AC_DEFINE([PDO_USE_MYSQLND], 1, [Whether pdo_mysql uses mysqlnd])
else
AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
@@ -157,17 +161,19 @@
AC_MSG_RESULT($pdo_inc_path)
])
- PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c,
$ext_shared,,-I$pdo_inc_path -I)
+
+ dnl fix after renaming to pdo_mysql
+ PHP_NEW_EXTENSION(pdo_mysqlnd, pdo_mysql.c mysql_driver.c mysql_statement.c,
$ext_shared,,-I$pdo_inc_path -I)
ifdef([PHP_ADD_EXTENSION_DEP],
[
- PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
+ PHP_ADD_EXTENSION_DEP(pdo_mysqlnd, pdo)
if test "$PHP_MYSQL" = "mysqlnd"; then
- PHP_ADD_EXTENSION_DEP(pdo_mysql, mysqlnd)
+ PHP_ADD_EXTENSION_DEP(pdo_mysqlnd, mysqlnd)
fi
])
- PDO_MYSQLND_MODULE_TYPE=external
+ PDO_MYSQL_MODULE_TYPE=external
- PHP_SUBST_OLD(PDO_MYSQLND_MODULE_TYPE)
+ PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)
fi
dnl vim: se ts=2 sw=2 et:
Copied: trunk/php5/ext/pdo_mysqlnd/php_pdo_mysql.h (from rev 1505,
trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h)
===================================================================
--- trunk/php5/ext/pdo_mysqlnd/php_pdo_mysql.h (rev 0)
+++ trunk/php5/ext/pdo_mysqlnd/php_pdo_mysql.h 2008-04-22 14:45:10 UTC (rev 1507)
@@ -0,0 +1,48 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2007 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@stripped so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: George Schlossnagle <george@stripped> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id: php_pdo_mysql.h,v 1.3.2.1.2.1 2007/01/01 09:36:05 sebastian Exp $ */
+
+#ifndef PHP_PDO_MYSQL_H
+#define PHP_PDO_MYSQL_H
+
+extern zend_module_entry pdo_mysql_module_entry;
+#define phpext_pdo_mysql_ptr &pdo_mysql_module_entry
+
+#ifdef PHP_WIN32
+#define PHP_PDO_MYSQL_API __declspec(dllexport)
+#else
+#define PHP_PDO_MYSQL_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+
+#endif /* PHP_PDO_MYSQL_H */
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
Deleted: trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h
===================================================================
--- trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h 2008-04-22 14:13:27 UTC (rev 1506)
+++ trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h 2008-04-22 14:45:10 UTC (rev 1507)
@@ -1,48 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2007 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@stripped so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: George Schlossnagle <george@stripped> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: php_pdo_mysql.h,v 1.3.2.1.2.1 2007/01/01 09:36:05 sebastian Exp $ */
-
-#ifndef PHP_PDO_MYSQL_H
-#define PHP_PDO_MYSQL_H
-
-extern zend_module_entry pdo_mysqlnd_module_entry;
-#define phpext_pdo_mysqlnd_ptr &pdo_mysqlnd_module_entry
-
-#ifdef PHP_WIN32
-#define PHP_PDO_MYSQL_API __declspec(dllexport)
-#else
-#define PHP_PDO_MYSQL_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-
-#endif /* PHP_PDO_MYSQL_H */
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
Added: trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h
===================================================================
--- trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h (rev 0)
+++ trunk/php5/ext/pdo_mysqlnd/php_pdo_mysqlnd.h 2008-04-22 14:45:10 UTC (rev 1507)
@@ -0,0 +1,7 @@
+/**
+ * TODO: Remove me after renaming to pdo_mysql
+ */
+#include "php_pdo_mysql.h"
+#ifndef phpext_pdo_mysqlnd_ptr
+#define phpext_pdo_mysqlnd_ptr phpext_pdo_mysql_ptr
+#endif
| Thread |
|---|
| • PHP mysqlnd svn commit: r1507 - trunk/php5/ext/pdo_mysqlnd | jschlueter | 22 Apr |
