Merge branch 'PHP-7.4'

remicollet · remicollet · commit 7dec7a154fd6 · 2019-05-21T14:26:08.000+02:00
* PHP-7.4:
  fix typo breaking shared build
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
@@ -21,7 +21,7 @@ if test $PHP_SQLITE3 != "no"; then
   PHP_CHECK_LIBRARY(sqlite3, sqlite3_stmt_readonly,
   [
     PHP_EVAL_INCLINE($SQLITE_CFLAGS)
-    PHP_EVAL_LIBLINE($SQLITE_LIBS, SQLITE_SHARED_LIBADD)
+    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])

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ if test $PHP_SQLITE3 != "no"; then`
`21`	`21`	`PHP_CHECK_LIBRARY(sqlite3, sqlite3_stmt_readonly,`
`22`	`22`	`[`
`23`	`23`	`PHP_EVAL_INCLINE($SQLITE_CFLAGS)`
`24`		`- PHP_EVAL_LIBLINE($SQLITE_LIBS, SQLITE_SHARED_LIBADD)`
	`24`	`+ PHP_EVAL_LIBLINE($SQLITE_LIBS, SQLITE3_SHARED_LIBADD)`
`25`	`25`	`AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if you have the sqlite3 extension enabled.])`
`26`	`26`	`], [`
`27`	`27`	`AC_MSG_ERROR([Please install SQLite 3.7.4 first or check libsqlite3 is present])`