archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Join SQLite library setup M4 macros to PHP_SETUP_SQLITE (#14372)

Browse source 
Macro can simplify managing minimum version of SQLite library on less
places.
This commit is contained in:
Peter Kokot 2024-05-30 18:16:30 +02:00 • committed by GitHub
parent 44c199ce6b
commit cba3891d53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build/php.m4
View file

@ -1918,6 +1918,18 @@ AC_DEFUN([PHP_SETUP_EXPAT], [
AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) 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 ----------------------------------------------------------------------------
dnl Misc. macros dnl Misc. macros
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------

5
ext/pdo_sqlite/config.m4
View file

@ -12,10 +12,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
PHP_CHECK_PDO_INCLUDES PHP_CHECK_PDO_INCLUDES
PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.7.7]) PHP_SETUP_SQLITE([PDO_SQLITE_SHARED_LIBADD])
PHP_EVAL_INCLINE($SQLITE_CFLAGS)
PHP_EVAL_LIBLINE($SQLITE_LIBS, PDO_SQLITE_SHARED_LIBADD)
PHP_CHECK_LIBRARY(sqlite3, sqlite3_close_v2, [ PHP_CHECK_LIBRARY(sqlite3, sqlite3_close_v2, [
AC_DEFINE(HAVE_SQLITE3_CLOSE_V2, 1, [have sqlite3_close_v2]) AC_DEFINE(HAVE_SQLITE3_CLOSE_V2, 1, [have sqlite3_close_v2])

5
ext/sqlite3/config0.m4
View file

@ -5,10 +5,7 @@ PHP_ARG_WITH([sqlite3],
[yes]) [yes])
if test $PHP_SQLITE3 != "no"; then if test $PHP_SQLITE3 != "no"; then
PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.7.7]) PHP_SETUP_SQLITE([SQLITE3_SHARED_LIBADD])
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_DEFINE(HAVE_SQLITE3, 1, [Define to 1 if you have the sqlite3 extension enabled.])
PHP_CHECK_LIBRARY(sqlite3, sqlite3_errstr, [ PHP_CHECK_LIBRARY(sqlite3, sqlite3_errstr, [