Skip to content

Commit 92a46fe

Browse files
weltlingweltling
committed
reverted the previous fix for libpng include
1 parent 0165eec commit 92a46fe

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

‎ext/gd/config.w32

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ if (PHP_GD != "no") {
99
CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
1010
CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
1111
CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") &&
12-
(CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng") ||
13-
CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) &&
12+
CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12") &&
1413
(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
1514
CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) &&
1615
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) ||

0 commit comments

Comments
 (0)