diff options
| author | Edin Kadribasic <edink@php.net> | 2005-08-06 22:20:06 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2005-08-06 22:20:06 +0000 |
| commit | 6e5ddd7b30d47694523c632a5e37eab95bbf60d9 (patch) | |
| tree | 92e473164e5f30fb029f5f20eb4bc79c0f027a51 | |
| parent | 36cc9d0d42afe99cbd355a83fa5ddca1e748750d (diff) | |
| download | php-git-6e5ddd7b30d47694523c632a5e37eab95bbf60d9.tar.gz | |
Only link zlib if we dont compile it in (#3406)
| -rw-r--r-- | ext/gd/config.w32 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 4b2a5c7a4e..4f82943ff5 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -8,7 +8,6 @@ if (PHP_GD != "no") { if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) && CHECK_LIB("freetype2.lib", "gd", PHP_GD) && CHECK_LIB("libpng.lib", "gd", PHP_GD) && - CHECK_LIB("zlib.lib", "gd", PHP_GD + ";..\\zlib;" + php_usual_lib_suspects) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") ) { if (PHP_T1LIB != "no") { @@ -21,6 +20,10 @@ if (PHP_GD != "no") { } } + if (PHP_ZLIB == "no" || PHP_ZLIB_SHARED) { + CHECK_LIB("zlib.lib", "gd", PHP_GD); + } + EXTENSION("gd", "gd.c gdttf.c", null, "-Iext/gd/libgd", "php_gd2.dll"); ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c \ gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \ |