From 54aae5d1efc8e7886973f14910523b1c4d7de699 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 11 Jul 2016 12:47:13 +0200 Subject: [PATCH] fix config.w32 for new libtidy support --- ext/tidy/config.w32 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index a87a833f92..654c1590c9 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'); -- 2.50.1