Remove non existent defines, change THREADSAFE to SQLITE_THREADSAFE and sync with 5.3

diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index 7040ad83a8137b0f5cef5b1595797a96e9fc0871..915c783c13b2bb66d0726cce42bdd435cf3bc3c8 100644 (file)
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -4,12 +4,11 @@ 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 @@ if test "$PHP_PDO_SQLITE" != "no"; then
     # 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,,-I@ext_builddir@/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

diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32
index 48e68ede073e09f072c063bbb78f35098209df0f..fdb19b95d6d7f14d9de9fcc758363832d896657a 100644 (file)
--- a/ext/pdo_sqlite/config.w32
+++ b/ext/pdo_sqlite/config.w32
@@ -4,10 +4,20 @@
 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"
+       }
+}