Merge branch 'PHP-7.4'

* 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

View file

@ -2182,7 +2182,6 @@ dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
dnl
AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [
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