com php-src: fix libwebp namings: ext/gd/config.w32
| From: | Anatol Belski | Date: | Fri, 24 Jul 2015 15:06:29 +0000 |
| Subject: | com php-src: fix libwebp namings: ext/gd/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88144@lists.php.net to get a copy of this message | ||
Commit: bf1ecbfe168e0f59c0deacbf7f2012c0d36a7f08
Author: Anatol Belski <ab@php.net> Fri, 24 Jul 2015 17:06:01 +0200
Parents: d44fc4a07361d2527dd7073b09e5e88134708858
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf1ecbfe168e0f59c0deacbf7f2012c0d36a7f08
Log:
fix libwebp namings
Changed paths:
M ext/gd/config.w32
Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index f0e0b22..2779a5b 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -23,7 +23,7 @@ if (PHP_GD != "no") {
) {
if (PHP_LIBWEBP != "no") {
- if (CHECK_LIB("libwebp.lib", "gd", PHP_GD) &&
+ if ((CHECK_LIB("libwebp_a.lib", "gd", PHP_GD) ||
CHECK_LIB("libwebp.lib", "gd", PHP_GD)) &&
CHECK_HEADER_ADD_INCLUDE("decode.h", "CFLAGS_GD", PHP_GD + ";" +
PHP_PHP_BUILD + "\\include\\webp") &&
CHECK_HEADER_ADD_INCLUDE("encode.h", "CFLAGS_GD", PHP_GD + ";" +
PHP_PHP_BUILD + "\\include\\webp")) {
ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBWEBP /D HAVE_GD_WEBP");