archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Simplify PHP_CHECK_PDO_INCLUDES calls
This commit is contained in:
Peter Kokot 2019-07-08 10:26:08 +02:00
commit 4f5c6bc15e
7 changed files with 6 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ext/pdo_sqlite/config.m4
View file

@ -10,22 +10,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
fi
ifdef([PHP_CHECK_PDO_INCLUDES],
[
PHP_CHECK_PDO_INCLUDES
],[
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$abs_srcdir/ext
elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
pdo_cv_inc_path=$phpincludedir/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
AC_MSG_RESULT($pdo_cv_inc_path)
])
PHP_CHECK_PDO_INCLUDES
PKG_CHECK_MODULES([SQLITE], [sqlite3 > 3.7.4])