diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-03 11:09:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-03 11:09:06 +0100 |
| commit | 36c8e5749557c2972702ad95b3564c5d329283f5 (patch) | |
| tree | c61530a73d988b88c01e6554d4c209075b2ee05f /ext/pdo_sqlite | |
| parent | d8c990256765706769fe5421a1f5fe34aa39c3b8 (diff) | |
| parent | 1dcdcd79badcd0c685580abb2e4e9064ee8cfa80 (diff) | |
| download | php-git-36c8e5749557c2972702ad95b3564c5d329283f5.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79056
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 15 |
1 files changed, 5 insertions, 10 deletions
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, |