scottmac Thu Jul 24 14:20:51 2008 UTC
Modified files:
/php-src/ext/pdo_sqlite config.m4 config.w32
Log:
Remove non existent defines, change THREADSAFE to SQLITE_THREADSAFE and sync
with 5.3
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.37&r2=1.38&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.37
php-src/ext/pdo_sqlite/config.m4:1.38
--- php-src/ext/pdo_sqlite/config.m4:1.37 Thu Jul 24 01:01:42 2008
+++ php-src/ext/pdo_sqlite/config.m4 Thu Jul 24 14:20:51 2008
@@ -1,15 +1,14 @@
-dnl $Id: config.m4,v 1.37 2008/07/24 01:01:42 scottmac Exp $
+dnl $Id: config.m4,v 1.38 2008/07/24 14:20:51 scottmac Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
if test "$PHP_PDO" != "no"; then
-PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
+PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO,
[ --without-pdo-sqlite[=DIR]
PDO: sqlite 3 support. DIR is the sqlite base
install directory [BUNDLED]], yes)
-
if test "$PHP_PDO_SQLITE" != "no"; then
ifdef([PHP_CHECK_PDO_INCLUDES],
@@ -74,18 +73,21 @@
# use bundled libs
pdo_sqlite_sources="libsqlite/sqlite3.c"
- if test "$enable_maintainer_zts" = "yes"; then
- threadsafe_flag="-DTHREADSAFE=1"
- else
- threadsafe_flag="-DTHREADSAFE=0"
- fi
+ if test "$enable_maintainer_zts" = "yes"; then
+ threadsafe_flag="-DSQLITE_THREADSAFE=1"
+ else
+ threadsafe_flag="-DSQLITE_THREADSAFE=0"
+ fi
PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core $pdo_sqlite_sources,
- $ext_shared,,[EMAIL PROTECTED]@/libsqlite -DPDO_SQLITE_BUNDLED=1
-DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path)
+ $ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1
$threadsafe_flag -I$pdo_inc_path)
PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1)
+
+ AC_CHECK_FUNCS(usleep nanosleep)
+ AC_CHECK_HEADERS(time.h)
fi
dnl Solaris fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.11
php-src/ext/pdo_sqlite/config.w32:1.12
--- php-src/ext/pdo_sqlite/config.w32:1.11 Thu Jul 24 11:24:26 2008
+++ php-src/ext/pdo_sqlite/config.w32 Thu Jul 24 14:20:51 2008
@@ -1,13 +1,23 @@
-// $Id: config.w32,v 1.11 2008/07/24 11:24:26 scottmac Exp $
+// $Id: config.w32,v 1.12 2008/07/24 14:20:51 scottmac Exp $
// vim:ft=javascript
ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
if (PHP_PDO_SQLITE != "no") {
-
- EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /DSQLITE_THREADSAFE=1 /I" +
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
+ EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" +
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c",
"pdo_sqlite");
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
}
+ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll",
"no");
+if (PHP_PDO_SQLITE_EXTERNAL != "no") {
+ if (CHECK_HEADER_ADD_INCLUDE("sqlite3.h", "CFLAGS_PDO_SQLITE_EXTERNAL",
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\include\\sqlite3") &&
+ CHECK_LIB("sqlite3-import.lib", "pdo_sqlite_external",
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\lib")
+ && ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo') ) {
+ EXTENSION("pdo_sqlite_external", "pdo_sqlite.c sqlite_driver.c
sqlite_statement.c", null, "/I" + configure_module_dirname, null,
"ext\\pdo_sqlite_external");
+ } else {
+ WARNING("pdo-sqlite-external support can't be enabled,
libraries or headers are missing")
+ PHP_PDO_SQLITE_EXTERNAL = "no"
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
