Skip to content

Commit 94200f1

Browse files
committed
Merge branch 'PHP-7.3'
* PHP-7.3: Fix libtidy exports when ext/tidy compiled static
2 parents 78e4f04 + be59987 commit 94200f1

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
@@ -3,7 +3,9 @@
33
ARG_WITH("tidy", "TIDY support", "no");
44

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

0 commit comments

Comments
 (0)