com php-src: fix config.w32 for new libtidy support: ext/tidy/config.w32

From: Date: Mon, 11 Jul 2016 12:05:43 +0000
Subject: com php-src: fix config.w32 for new libtidy support: ext/tidy/config.w32
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92922@lists.php.net to get a copy of this message
Commit: 54aae5d1efc8e7886973f14910523b1c4d7de699 Author: Anatol Belski <ab@php.net> Mon, 11 Jul 2016 12:47:13 +0200 Parents: 6319a358496dda48d2c9541aec59fa78a0a96492 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54aae5d1efc8e7886973f14910523b1c4d7de699 Log: fix config.w32 for new libtidy support Changed paths: M ext/tidy/config.w32 Diff: diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index a87a833..654c159 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -4,12 +4,17 @@ ARG_WITH("tidy", "TIDY support", "no"); if (PHP_TIDY != "no") { - if (CHECK_LIB("libtidy_a.lib;libtidy.lib", "tidy", PHP_TIDY) && + if (CHECK_LIB("libtidy_a.lib;libtidy.lib;tidy_a.lib;tidy.lib", "tidy", PHP_TIDY) && ( CHECK_HEADER_ADD_INCLUDE("tidy.h", "CFLAGS_TIDY") || CHECK_HEADER_ADD_INCLUDE("tidy/tidy.h", "CFLAGS_TIDY", null, null, true) || CHECK_HEADER_ADD_INCLUDE("libtidy/tidy.h", "CFLAGS_TIDY", null, null, true) )) { + + if (CHECK_HEADER_ADD_INCLUDE("tidybuffio.h", "CFLAGS_TIDY")) { + AC_DEFINE('HAVE_TIDYBUFFIO_H', 1, 'Have tidybuffio.h header file'); + } + EXTENSION("tidy", "tidy.c"); AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library'); ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');

« previous php.cvs (#92922) next »