scottmac Thu Jul 31 23:25:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite config.m4
/php-src/ext/sqlite3/tests sqlite3_12_unfinalized_stmt_cleanup.phpt
Log:
Make pdo_sqlite use the bundled extension with sqlite3 (pdo_sqlite gets fts!)
Fix test after class rename
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.4&r2=1.26.2.9.2.7.2.5&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.4
php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.5
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.4 Fri Jul 25 13:46:24 2008
+++ php-src/ext/pdo_sqlite/config.m4 Thu Jul 31 23:25:39 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.9.2.7.2.4 2008/07/25 13:46:24 jani Exp $
+dnl $Id: config.m4,v 1.26.2.9.2.7.2.5 2008/07/31 23:25:39 scottmac Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -72,21 +72,14 @@
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core,
$ext_shared,,-I$pdo_inc_path)
else
- # use bundled libs
- pdo_sqlite_sources="libsqlite/sqlite3.c"
-
- if test "$enable_maintainer_zts" = "yes"; then
- threadsafe_flag="-DSQLITE_THREADSAFE=1"
- else
- threadsafe_flag="-DSQLITE_THREADSAFE=0"
- fi
-
+ # use bundled libs
PHP_NEW_EXTENSION(pdo_sqlite,
- $php_pdo_sqlite_sources_core $pdo_sqlite_sources,
- $ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1
$threadsafe_flag -I$pdo_inc_path)
+ $php_pdo_sqlite_sources_core,
+ $ext_shared,,-DPDO_SQLITE_BUNDLED=1 -I$pdo_inc_path)
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
- PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1)
+ PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3)
+ PHP_ADD_INCLUDE($abs_srcdir/ext/sqlite3/libsqlite)
AC_CHECK_FUNCS(usleep nanosleep)
AC_CHECK_HEADERS(time.h)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
diff -u
php-src/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt:1.1.2.3
php-src/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt:1.1.2.4
--- php-src/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt:1.1.2.3
Tue Jul 29 00:56:53 2008
+++ php-src/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt Thu Jul
31 23:25:39 2008
@@ -47,6 +47,6 @@
bool(true)
Check db was closed
-Warning: SQLite3_result::numColumns(): The SQLite3_result object has not been
correctly initialised in %s on line %d
+Warning: SQLite3Result::numColumns(): The SQLite3Result object has not been
correctly initialised in %s on line %d
bool(false)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
