Title: [184502] releases/WebKitGTK/webkit-2.4
- Revision
- 184502
- Author
- [email protected]
- Date
- 2015-05-18 10:51:48 -0700 (Mon, 18 May 2015)
Log Message
[W32] Configure may misdetect ICU libraries
https://bugs.webkit.org/show_bug.cgi?id=143767
Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Carlos Garcia Campos.
Try to use pkg-config to detect ICU libraries.
MinGW packages tend to have .pc files these days. Use them.
ICU naming and structure is complex enough to warrant this, and
asking pkg-config might result in things like
UNICODE_LIBS="-licui18n54 -licuuc54 -licudata54"
instead of the default
UNICODE_LIBS="-licui18n -licuuc"
and pkg-config usually knows best.
* Source/autotools/FindDependencies.m4:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (184501 => 184502)
--- releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-18 17:46:43 UTC (rev 184501)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-18 17:51:48 UTC (rev 184502)
@@ -1,3 +1,23 @@
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
+ [W32] Configure may misdetect ICU libraries
+ https://bugs.webkit.org/show_bug.cgi?id=143767
+
+ Reviewed by Carlos Garcia Campos.
+
+ Try to use pkg-config to detect ICU libraries.
+
+ MinGW packages tend to have .pc files these days. Use them.
+
+ ICU naming and structure is complex enough to warrant this, and
+ asking pkg-config might result in things like
+ UNICODE_LIBS="-licui18n54 -licuuc54 -licudata54"
+ instead of the default
+ UNICODE_LIBS="-licui18n -licuuc"
+ and pkg-config usually knows best.
+
+ * Source/autotools/FindDependencies.m4:
+
2015-04-07 Philip Chimento <[email protected]>
configure check for clang version is incorrect
Modified: releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 (184501 => 184502)
--- releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2015-05-18 17:46:43 UTC (rev 184501)
+++ releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2015-05-18 17:51:48 UTC (rev 184502)
@@ -109,8 +109,14 @@
UNICODE_LIBS="-licucore"
;;
*-*-mingw*)
- UNICODE_CFLAGS=""
- UNICODE_LIBS="-licui18n -licuuc"
+ PKG_CHECK_MODULES(ICU, icu-i18n, ,)
+ if test "x$ICU_LIBS" = "x" ; then
+ UNICODE_CFLAGS=""
+ UNICODE_LIBS="-licui18n -licuuc"
+ else
+ UNICODE_CFLAGS="$ICU_CFLAGS"
+ UNICODE_LIBS="$ICU_LIBS"
+ fi
AC_CHECK_HEADERS([unicode/uchar.h], [], [AC_MSG_ERROR([Could not find ICU headers.])])
;;
*)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
