mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-22 11:44:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make pdo_sqlite use the bundled extension with sqlite3 (pdo_sqlite gets fts!)

Browse Source 
Fix test after class rename
This commit is contained in:
Scott MacVicar 2008-07-31 23:25:39 +00:00
parent c501d5f2a4
commit 0d2f16d3d0
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/pdo_sqlite/config.m4
View File

@ -72,21 +72,14 @@ if test "$PHP_PDO_SQLITE" != "no"; then
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)

2
ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
View File

@ -47,6 +47,6 @@ Closing database
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