[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32
Commit:45351eaab4d8f065c5948de5f28df975b36d592c Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 09:40:42 +0200 Parents: 60a280936e52b3ab20f0ece06e80088a5bd8fd0c 0165eec1ea63d4b4a063d68e7b78947f038d67ba Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45351eaab4d8f065c5948de5f28df975b36d592c Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fixed include checks for libpng under win Changed paths: MM ext/gd/config.w32 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fixed include checks for libpng under win: ext/gd/config.w32
Commit:0165eec1ea63d4b4a063d68e7b78947f038d67ba
Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 09:39:34 +0200
Parents: 4f860a44126bf4cd87e7eb4eaa0ea4d44f96abc5
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=0165eec1ea63d4b4a063d68e7b78947f038d67ba
Log:
fixed include checks for libpng under win
Changed paths:
M ext/gd/config.w32
Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 8f1c13f..af9aa83 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,7 +9,8 @@ if (PHP_GD != no) {
CHECK_LIB(freetype_a.lib;freetype.lib, gd, PHP_GD)
CHECK_LIB(libpng_a.lib;libpng.lib, gd, PHP_GD)
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
- CHECK_HEADER_ADD_INCLUDE(png.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\libpng12)
+ (CHECK_HEADER_ADD_INCLUDE(png.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\libpng) ||
+ CHECK_HEADER_ADD_INCLUDE(png.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\libpng12))
(CHECK_LIB(libiconv_a.lib;libiconv.lib, gd, PHP_GD) ||
CHECK_LIB(iconv_a.lib;iconv.lib, gd, PHP_GD))
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_GD, PHP_GD)
(((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib;zlib.lib, gd,
PHP_GD) )) ||
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: reverted the previous fix for libpng include: ext/gd/config.w32
Commit:92a46fe07e4407d52eb384c48aec5a3538731341
Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 09:57:44 +0200
Parents: 0165eec1ea63d4b4a063d68e7b78947f038d67ba
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=92a46fe07e4407d52eb384c48aec5a3538731341
Log:
reverted the previous fix for libpng include
Changed paths:
M ext/gd/config.w32
Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index af9aa83..8f1c13f 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,8 +9,7 @@ if (PHP_GD != no) {
CHECK_LIB(freetype_a.lib;freetype.lib, gd, PHP_GD)
CHECK_LIB(libpng_a.lib;libpng.lib, gd, PHP_GD)
CHECK_HEADER_ADD_INCLUDE(gd.h, CFLAGS_GD, PHP_GD +
;ext\\gd\\libgd)
- (CHECK_HEADER_ADD_INCLUDE(png.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\libpng) ||
- CHECK_HEADER_ADD_INCLUDE(png.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\libpng12))
+ CHECK_HEADER_ADD_INCLUDE(png.h, CFLAGS_GD, PHP_GD + ; +
PHP_PHP_BUILD + \\include\\libpng12)
(CHECK_LIB(libiconv_a.lib;libiconv.lib, gd, PHP_GD) ||
CHECK_LIB(iconv_a.lib;iconv.lib, gd, PHP_GD))
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_GD, PHP_GD)
(((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib;zlib.lib, gd,
PHP_GD) )) ||
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32
Commit:26e492f2f3d3e26f7320957172e37ee49f6e6112 Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 10:00:09 +0200 Parents: 45351eaab4d8f065c5948de5f28df975b36d592c 92a46fe07e4407d52eb384c48aec5a3538731341 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26e492f2f3d3e26f7320957172e37ee49f6e6112 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: reverted the previous fix for libpng include Changed paths: MM ext/gd/config.w32 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
