scottmac Thu Jul 31 23:56:33 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite config.m4
Log:
Still need defines so that sqlite3.h will match the lib that sqlite3 uses
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.5&r2=1.26.2.9.2.7.2.6&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.5
php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.6
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.5 Thu Jul 31 23:25:39 2008
+++ php-src/ext/pdo_sqlite/config.m4 Thu Jul 31 23:56:32 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.9.2.7.2.5 2008/07/31 23:25:39 scottmac Exp $
+dnl $Id: config.m4,v 1.26.2.9.2.7.2.6 2008/07/31 23:56:32 scottmac Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -73,9 +73,17 @@
PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core,
$ext_shared,,-I$pdo_inc_path)
else
# use bundled libs
+ if test "$enable_maintainer_zts" = "yes"; then
+ threadsafe_flags="-DSQLITE_THREADSAFE=1"
+ else
+ 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,
- $ext_shared,,-DPDO_SQLITE_BUNDLED=1 -I$pdo_inc_path)
+ $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags
-I$pdo_inc_path)
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
