]> granicus.if.org Git - php/commitdiff
fix config.w32 for new libtidy support
authorAnatol Belski <ab@php.net>
Mon, 11 Jul 2016 10:47:13 +0000 (12:47 +0200)
committerAnatol Belski <ab@php.net>
Mon, 11 Jul 2016 12:05:43 +0000 (14:05 +0200)
ext/tidy/config.w32

index a87a833f92390b4d5224ebe53d05d40c65cfb766..654c1590c986958b8e8f309b731b73d26eef8445 100644 (file)
@@ -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');