diff options
| author | Scott MacVicar <scottmac@php.net> | 2008-08-01 12:02:40 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2008-08-01 12:02:40 +0000 |
| commit | 2feac2e6d2e7f913e101b4dac315c0000cf1c06c (patch) | |
| tree | 5a84ee91b2326d1875a3ecb7167285299478b779 /ext | |
| parent | f2fcee5553671938818d172423b07d234f22b439 (diff) | |
| download | php-git-2feac2e6d2e7f913e101b4dac315c0000cf1c06c.tar.gz | |
MFB: Make pdo_sqlite use the bundled extension with sqlite3
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index b85dce7834..a894c20750 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -72,21 +72,22 @@ 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" - + # use bundled libs if test "$enable_maintainer_zts" = "yes"; then - threadsafe_flag="-DSQLITE_THREADSAFE=1" + threadsafe_flags="-DSQLITE_THREADSAFE=1" else - threadsafe_flag="-DSQLITE_THREADSAFE=0" + threadsafe_flags="-DSQLITE_THREADSAFE=0" fi + other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" + 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 $other_flags $threadsafe_flags -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) |