Title: [164798] releases/WebKitGTK/webkit-2.4
- Revision
- 164798
- Author
- [email protected]
- Date
- 2014-02-27 06:01:37 -0800 (Thu, 27 Feb 2014)
Log Message
Merge r164796 - Fallback on checking for libz manualy if zlib.pc isn't available.
https://bugs.webkit.org/show_bug.cgi?id=127061
Patch by Koop Mast <[email protected]> on 2014-02-27
Reviewed by Gustavo Noronha Silva.
* Source/autotools/FindDependencies.m4:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (164797 => 164798)
--- releases/WebKitGTK/webkit-2.4/ChangeLog 2014-02-27 13:58:58 UTC (rev 164797)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2014-02-27 14:01:37 UTC (rev 164798)
@@ -1,3 +1,12 @@
+2014-02-27 Koop Mast <[email protected]>
+
+ Fallback on checking for libz manualy if zlib.pc isn't available.
+ https://bugs.webkit.org/show_bug.cgi?id=127061
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/autotools/FindDependencies.m4:
+
2014-02-17 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and Versions.m4 for 2.3.90 release.
Modified: releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 (164797 => 164798)
--- releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2014-02-27 13:58:58 UTC (rev 164797)
+++ releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2014-02-27 14:01:37 UTC (rev 164798)
@@ -129,7 +129,10 @@
AC_SUBST([UNICODE_CFLAGS])
AC_SUBST([UNICODE_LIBS])
-PKG_CHECK_MODULES([ZLIB], [zlib])
+PKG_CHECK_MODULES([ZLIB], [zlib], [], [
+ AC_CHECK_LIB([z], [gzread], ,
+ [AC_MSG_ERROR([unable to find the libz library])]
+ )])
AC_SUBST([ZLIB_CFLAGS])
AC_SUBST([ZLIB_LIBS])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
