diff options
| author | Remi Collet <remi@php.net> | 2017-08-04 13:21:41 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-08-04 13:21:41 +0200 |
| commit | aee20e637a8510acea40feb083ad307bfcbdb758 (patch) | |
| tree | 4a154e8efb5317e213568d533d2be489c6616362 | |
| parent | 21c6ba3412ef863652bb05dfedcd4a8d8f4f044c (diff) | |
| parent | 159e5c1048340fc4eecd231dff0903b59729ca3a (diff) | |
| download | php-git-aee20e637a8510acea40feb083ad307bfcbdb758.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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" |