diff options
| author | Remi Collet <remi@php.net> | 2017-08-31 07:56:00 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-08-31 07:56:00 +0200 |
| commit | bcf50b7261c32217972dd7cad9fa877e19c696ae (patch) | |
| tree | 3911d2c6f437418aa3e2019d9586e39d905c6abd | |
| parent | ae364546d617e17d7a20bfde3cc37e88d98a8889 (diff) | |
| parent | 3239f6d6798d86fdbf8e03aa741d9990bcfffe79 (diff) | |
| download | php-git-bcf50b7261c32217972dd7cad9fa877e19c696ae.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move AC_DEFINE in the right position (in bundled lib conditon)
| -rw-r--r-- | ext/sqlite3/config0.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index 0e5fbc5d1d..78fd6224dc 100644 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@ -85,11 +85,11 @@ if test $PHP_SQLITE3 != "no"; then other_flags="$other_flags -DSQLITE_ENABLE_ICU=1" fi + AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function]) PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" 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" |