diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-03 10:40:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-03 11:08:48 +0100 |
| commit | 1dcdcd79badcd0c685580abb2e4e9064ee8cfa80 (patch) | |
| tree | d93289c7db2b32cc261ec1ae2b6dbdfb317fe545 | |
| parent | c39b45df72903ee2ba8999e9ed9586a0c0750f0f (diff) | |
| download | php-git-1dcdcd79badcd0c685580abb2e4e9064ee8cfa80.tar.gz | |
Fixed bug #79056
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 15 | ||||
| -rw-r--r-- | ext/sqlite3/config0.m4 | 18 |
3 files changed, 16 insertions, 21 deletions
@@ -56,6 +56,10 @@ PHP NEWS - Session: . Fixed bug #79031 (Session unserialization problem). (Nikita) +- Sqlite3: + . Fixed bug #79056 (sqlite does not respect PKG_CONFIG_PATH during + compilation). (Nikita) + - Spl: . Fixed bug #78976 (SplFileObject::fputcsv returns -1 on failure). (cmb) diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 4b1f543056..fbb3d05ce7 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -14,22 +14,17 @@ if test "$PHP_PDO_SQLITE" != "no"; then PKG_CHECK_MODULES([SQLITE], [sqlite3 > 3.7.4]) - PHP_CHECK_LIBRARY(sqlite3, sqlite3_open_v2, - [ - PHP_EVAL_INCLINE($SQLITE_CFLAGS) - PHP_EVAL_LIBLINE($SQLITE_LIBS, PDO_SQLITE_SHARED_LIBADD) - AC_DEFINE(HAVE_PDO_SQLITELIB, 1, [Define to 1 if you have the pdo_sqlite extension enabled.]) - ], [ - AC_MSG_ERROR([Please install SQLite 3.7.4 first or check libsqlite3 is present]) - ]) + PHP_EVAL_INCLINE($SQLITE_CFLAGS) + PHP_EVAL_LIBLINE($SQLITE_LIBS, PDO_SQLITE_SHARED_LIBADD) + AC_DEFINE(HAVE_PDO_SQLITELIB, 1, [Define to 1 if you have the pdo_sqlite extension enabled.]) PHP_CHECK_LIBRARY(sqlite3, sqlite3_close_v2, [ AC_DEFINE(HAVE_SQLITE3_CLOSE_V2, 1, [have sqlite3_close_v2]) - ]) + ], [], [$PDO_SQLITE_SHARED_LIBADD]) PHP_CHECK_LIBRARY(sqlite3, sqlite3_column_table_name, [ AC_DEFINE(HAVE_SQLITE3_COLUMN_TABLE_NAME, 1, [have sqlite3_column_table_name]) - ]) + ], [], [$PDO_SQLITE_SHARED_LIBADD]) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) PHP_NEW_EXTENSION(pdo_sqlite, pdo_sqlite.c sqlite_driver.c sqlite_statement.c, diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index c44582c312..0d607593b7 100644 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@ -7,23 +7,19 @@ PHP_ARG_WITH([sqlite3], if test $PHP_SQLITE3 != "no"; then PKG_CHECK_MODULES([SQLITE], [sqlite3 > 3.7.4]) - PHP_CHECK_LIBRARY(sqlite3, sqlite3_stmt_readonly, - [ - PHP_EVAL_INCLINE($SQLITE_CFLAGS) - PHP_EVAL_LIBLINE($SQLITE_LIBS, SQLITE3_SHARED_LIBADD) - AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if you have the sqlite3 extension enabled.]) - ], [ - AC_MSG_ERROR([Please install SQLite 3.7.4 first or check libsqlite3 is present]) - ]) + PHP_EVAL_INCLINE($SQLITE_CFLAGS) + PHP_EVAL_LIBLINE($SQLITE_LIBS, SQLITE3_SHARED_LIBADD) + AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if you have the sqlite3 extension enabled.]) PHP_CHECK_LIBRARY(sqlite3, sqlite3_errstr, [ AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function]) - ]) + ], [], [$SQLITE3_SHARED_LIBADD]) PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension, [], - [AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1, [have sqlite3 with extension support]) - ]) + [AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1, [have sqlite3 with extension support])], + [$SQLITE3_SHARED_LIBADD] + ) PHP_NEW_EXTENSION(sqlite3, sqlite3.c, $ext_shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(SQLITE3_SHARED_LIBADD) |