From 3e35b0898023e3e3c3350c21ed8ca69d0a1d7ec4 Mon Sep 17 00:00:00 2001 From: SATO Kentaro Date: Wed, 18 Dec 2019 02:47:08 +0900 Subject: [PATCH] Fix #78983: pdo_pgsql config.w32 cannot find libpq-fe.h When configured with a path specified. --- NEWS | 4 ++++ ext/pdo_pgsql/config.w32 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index fd345f6f87..ea94f1f7bf 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,10 @@ PHP NEWS . Fixed bug #78923 (Artifacts when convoluting image with transparency). (wilson chen) +- PDO_PgSQL: + . Fixed bug #78983 (pdo_pgsql config.w32 cannot find libpq-fe.h). (SATŌ + Kentarō) + 18 Dec 2019, PHP 7.3.13 - Bcmath: diff --git a/ext/pdo_pgsql/config.w32 b/ext/pdo_pgsql/config.w32 index 478b63ab70..47a8a0ecd9 100644 --- a/ext/pdo_pgsql/config.w32 +++ b/ext/pdo_pgsql/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("pdo-pgsql", "PostgreSQL support for PDO", "no"); if (PHP_PDO_PGSQL != "no") { if (CHECK_LIB("libpq.lib", "pdo_pgsql", PHP_PDO_PGSQL) && - CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\include\\libpq;")) { + CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\include\\libpq;")) { EXTENSION("pdo_pgsql", "pdo_pgsql.c pgsql_driver.c pgsql_statement.c"); if (CHECK_HEADER_ADD_INCLUDE("pg_config.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql")) { -- 2.49.0