]> granicus.if.org Git - php/commitdiff
Fix detection of pg_config.h
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 7 Aug 2019 11:24:05 +0000 (13:24 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 7 Aug 2019 11:25:07 +0000 (13:25 +0200)
pg_config.h is supposed to be placed right besides libpq-fe.h, so we
should check the same paths.

ext/pdo_pgsql/config.w32

index 478b63ab7083be78ec397c6244e903f2ab0c6c7e..fc060ced430dcf1088f35ea35e7d5a265d1ba189 100644 (file)
@@ -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) {