com php-src: Enable JSON1 for bundled libsqlite: ext/pdo_sqli te/config.m4 ext/pdo_sqlite/config.w32 ext/sqli te3/config.w32 ext/sqlite3/config0.m4
| From: | Anatol Belski | Date: | Wed, 22 Nov 2017 11:00:13 +0000 |
| Subject: | com php-src: Enable JSON1 for bundled libsqlite: ext/pdo_sqli te/config.m4 ext/pdo_sqlite/config.w32 ext/sqli te3/config.w32 ext/sqlite3/config0.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100344@lists.php.net to get a copy of this message | ||
Commit: ed0a58d0ae362be49bc26523303b925bcdaa0a84
Author: Morva Kristóf <kristof92@gmail.com> Sat, 14 Oct 2017 15:18:44 +0200
Committer: Anatol Belski <ab@php.net> Wed, 22 Nov 2017 12:00:13 +0100
Parents: 179ed6e43d9703fe6bdaa286aec79f7e131a8ab0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed0a58d0ae362be49bc26523303b925bcdaa0a84
Log:
Enable JSON1 for bundled libsqlite
Changed paths:
M ext/pdo_sqlite/config.m4
M ext/pdo_sqlite/config.w32
M ext/sqlite3/config.w32
M ext/sqlite3/config0.m4
Diff:
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index b050eea..0200a7d 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -83,7 +83,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
fi
AC_DEFINE(HAVE_SQLITE3_CLOSE_V2, 1, [have sqlite3_close_v2])
- other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1
-DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
+ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1
-DSQLITE_ENABLE_JSON1=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
dnl As long as intl is not shared we can have ICU support
if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED"
!= "yes"; then
diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32
index 71ea9ef..7e459c1 100644
--- a/ext/pdo_sqlite/config.w32
+++ b/ext/pdo_sqlite/config.w32
@@ -4,7 +4,7 @@
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_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" :
"0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D
SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /I" + configure_module_dirname +
"/../sqlite3/libsqlite /I" + configure_module_dirname);
+ EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c",
null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" :
"0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D
SQLITE_ENABLE_JSON1=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /I" +
configure_module_dirname + "/../sqlite3/libsqlite /I" + configure_module_dirname);
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
// If pdo_sqlite is static, and sqlite3 is also static, then we don't add a second copy of
the sqlite3 libs
diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32
index 7c478303..0232205 100644
--- a/ext/sqlite3/config.w32
+++ b/ext/sqlite3/config.w32
@@ -4,7 +4,7 @@
ARG_WITH("sqlite3", "SQLite 3 support", "no");
if (PHP_SQLITE3 != "no") {
- ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS ==
"yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D
SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /D
SQLITE_API=__declspec(dllexport) ");
+ ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS ==
"yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D
SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D SQLITE_ENABLE_JSON1=1 /D
SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /D SQLITE_API=__declspec(dllexport) ");
EXTENSION("sqlite3", "sqlite3.c", null, "/I" +
configure_module_dirname + "/libsqlite /I" + configure_module_dirname + "
/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c",
"sqlite3");
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index 78fd622..93a0599 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -78,7 +78,7 @@ if test $PHP_SQLITE3 != "no"; then
debug_flags="-DSQLITE_DEBUG=1"
fi
- other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1
-DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
+ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1
-DSQLITE_ENABLE_JSON1=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
dnl As long as intl is not shared we can have ICU support
if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" !=
"yes"; then