From 5dee36c4415a74a3f1d325430074df80db692b8e Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Thu, 30 May 2024 12:49:16 +0200
Subject: [PATCH] Join SQLite library setup M4 macros to PHP_SETUP_SQLITE

Macro can simplify managing minimum version of SQLite library on less
places.
---
 build/php.m4             | 12 ++++++++++++
 ext/pdo_sqlite/config.m4 |  5 +----
 ext/sqlite3/config0.m4   |  5 +----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/php.m4 b/build/php.m4
index fa2365b363197..d18093e304f87 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1935,6 +1935,18 @@ AC_DEFUN([PHP_SETUP_EXPAT], [
   AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
 ])
 
+dnl
+dnl PHP_SETUP_SQLITE([shared-add])
+dnl
+dnl Common setup macro for SQLite library.
+dnl
+AC_DEFUN([PHP_SETUP_SQLITE], [
+PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.7.7], [
+  PHP_EVAL_INCLINE([$SQLITE_CFLAGS])
+  PHP_EVAL_LIBLINE([$SQLITE_LIBS], [$1])
+])
+])
+
 dnl ----------------------------------------------------------------------------
 dnl Misc. macros
 dnl ----------------------------------------------------------------------------
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index 0aeb9bad64d17..bd4e51bf7f731 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -12,10 +12,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
 
   PHP_CHECK_PDO_INCLUDES
 
-  PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.7.7])
-
-  PHP_EVAL_INCLINE($SQLITE_CFLAGS)
-  PHP_EVAL_LIBLINE($SQLITE_LIBS, PDO_SQLITE_SHARED_LIBADD)
+  PHP_SETUP_SQLITE([PDO_SQLITE_SHARED_LIBADD])
 
   PHP_CHECK_LIBRARY(sqlite3, sqlite3_close_v2, [
     AC_DEFINE(HAVE_SQLITE3_CLOSE_V2, 1, [have sqlite3_close_v2])
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index 2373d13d3062c..72d72d4ffe4e4 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -5,10 +5,7 @@ PHP_ARG_WITH([sqlite3],
   [yes])
 
 if test $PHP_SQLITE3 != "no"; then
-  PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.7.7])
-
-  PHP_EVAL_INCLINE($SQLITE_CFLAGS)
-  PHP_EVAL_LIBLINE($SQLITE_LIBS, SQLITE3_SHARED_LIBADD)
+  PHP_SETUP_SQLITE([SQLITE3_SHARED_LIBADD])
   AC_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if you have the sqlite3 extension enabled.])
 
   PHP_CHECK_LIBRARY(sqlite3, sqlite3_errstr, [