Fixed bug #79056

diff --git a/NEWS b/NEWS
index 16d43e66edd16c76788150bcca835c25c4ec27be..4965191c4d06e6828b38594650fcd5d180d1301f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 4b1f543056325acf111f220ae28a818b49a38a9b..fbb3d05ce7dcec982ab8d52ba779c872c9ac8959 100644 (file)
--- 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 c44582c312c78168b06127c9d6d17f508f66567c..0d607593b742bf868fe88a04dfc356c790070018 100644 (file)
--- 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)