diff options
| author | Remi Collet <remi@php.net> | 2017-08-04 13:21:54 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-08-04 13:21:54 +0200 |
| commit | bf1c242cf46986a8afcc0b3bd2642f79dbc63417 (patch) | |
| tree | 46a4481fc57e3de46ce4ad8477a40724e923c972 | |
| parent | 353f7bf461005895082c440ee6619edf7e2ec8e8 (diff) | |
| parent | aee20e637a8510acea40feb083ad307bfcbdb758 (diff) | |
| download | php-git-bf1c242cf46986a8afcc0b3bd2642f79dbc63417.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
use AC_DEFINE + win32
| -rw-r--r-- | ext/sqlite3/config.w32 | 1 | ||||
| -rw-r--r-- | ext/sqlite3/config0.m4 | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32 index 29a2832f1f..f3c2f64773 100644 --- a/ext/sqlite3/config.w32 +++ b/ext/sqlite3/config.w32 @@ -10,5 +10,6 @@ if (PHP_SQLITE3 != "no") { ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", "sqlite3"); AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support"); + AC_DEFINE("HAVE_SQLITE3_ERRSTR", 1, "have sqlite3_errstr function") PHP_INSTALL_HEADERS("ext/sqlite3", "libsqlite/sqlite3.h"); } diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index ba760e1713..0e5fbc5d1d 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 -DHAVE_SQLITE3_ERRSTR=1" + other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=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 @@ -89,6 +89,7 @@ if test $PHP_SQLITE3 != "no"; then PHP_INSTALL_HEADERS([ext/sqlite3/libsqlite/sqlite3.h]) fi + AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function]) AC_DEFINE(HAVE_SQLITE3,1,[ ]) sqlite3_sources="sqlite3.c $sqlite3_extra_sources" |