diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-07-08 10:26:08 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-08 10:26:08 +0200 |
| commit | 4f5c6bc15eaed49fcc03124fd71f28013b9fe73c (patch) | |
| tree | 21d897fe97787dfc4813f6182afca144da2e25ca /ext/pdo_sqlite | |
| parent | b8dae9981d89c579a21a869304927685455c9ac1 (diff) | |
| parent | a39ea91753c5d131ff802ee394ee23ce2f37d7f4 (diff) | |
| download | php-git-4f5c6bc15eaed49fcc03124fd71f28013b9fe73c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Simplify PHP_CHECK_PDO_INCLUDES calls
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 32bc60fa9a..c45d73f526 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -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]) |