Skip to content

Commit 0d166f7

Browse files
committed
Fix libtidy exports when ext/tidy compiled static
1 parent 99f1f3d commit 0d166f7

File tree

2 files changed

+167
-261
lines changed

2 files changed

+167
-261
lines changed

ext/tidy/config.w32

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
ARG_WITH("tidy", "TIDY support", "no");
55

66
if (PHP_TIDY != "no") {
7-
if (CHECK_LIB("libtidy_a.lib;libtidy.lib;tidy_a.lib;tidy.lib", "tidy", PHP_TIDY) &&
7+
var tidy_static = false;
8+
if (CHECK_LIB("libtidy_a.lib;tidy_a.lib", "tidy", PHP_TIDY) && (tidy_static = true) ||
9+
CHECK_LIB("libtidy.lib;tidy.lib", "tidy", PHP_TIDY)) &&
810
(
911
CHECK_HEADER_ADD_INCLUDE("tidy.h", "CFLAGS_TIDY") ||
1012
CHECK_HEADER_ADD_INCLUDE("tidy/tidy.h", "CFLAGS_TIDY", null, null, true) ||
@@ -22,6 +24,10 @@ if (PHP_TIDY != "no") {
2224
if (!PHP_TIDY_SHARED) {
2325
ADD_DEF_FILE("ext\\tidy\\php_tidy.def");
2426
}
27+
if (tidy_static) {
28+
ADD_FLAG("CFLAGS_TIDY", "/DTIDY_STATIC=1");
29+
}
30+
2531
} else {
2632
WARNING("tidy not enabled; libraries and headers not found");
2733
}

0 commit comments

Comments
 (0)