From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 7 Aug 2019 11:24:05 +0000 (+0200)
Subject: Fix detection of pg_config.h
X-Git-Tag: php-7.4.0beta4~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be794894ef30764e54a8a52fa6c085f3c4a88b14;p=php

Fix detection of pg_config.h

pg_config.h is supposed to be placed right besides libpq-fe.h, so we
should check the same paths.
---

diff --git a/ext/pdo_pgsql/config.w32 b/ext/pdo_pgsql/config.w32
index 478b63ab70..fc060ced43 100644
--- a/ext/pdo_pgsql/config.w32
+++ b/ext/pdo_pgsql/config.w32
@@ -7,7 +7,7 @@ if (PHP_PDO_PGSQL != "no") {
 			CHECK_HEADER_ADD_INCLUDE("libpq-fe.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + 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")) {
+		if (CHECK_HEADER_ADD_INCLUDE("pg_config.h", "CFLAGS_PDO_PGSQL", PHP_PDO_PGSQL + ";" + PHP_PHP_BUILD + "\\include\\pgsql;" + PHP_PHP_BUILD + "\\include\\libpq;")) {
 			ADD_FLAG('CFLAGS_PDO_PGSQL', "/D HAVE_PG_CONFIG_H");
 		}
 		if (X64) {