Title: [91787] trunk/Source/_javascript_Core
- Revision
- 91787
- Author
- [email protected]
- Date
- 2011-07-26 14:49:03 -0700 (Tue, 26 Jul 2011)
Log Message
Unreviewed build fix for Qt/Linux.
On platforms with no glib and gstreamer we should not build _javascript_core
with the Glib support. This is related to http://trac.webkit.org/changeset/91752.
* wtf/wtf.pri:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (91786 => 91787)
--- trunk/Source/_javascript_Core/ChangeLog 2011-07-26 21:44:28 UTC (rev 91786)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-07-26 21:49:03 UTC (rev 91787)
@@ -1,3 +1,12 @@
+2011-07-26 Alexis Menard <[email protected]>
+
+ Unreviewed build fix for Qt/Linux.
+
+ On platforms with no glib and gstreamer we should not build _javascript_core
+ with the Glib support. This is related to http://trac.webkit.org/changeset/91752.
+
+ * wtf/wtf.pri:
+
2011-07-26 Juan C. Montemayor <[email protected]>
JSON errors should be informative
Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (91786 => 91787)
--- trunk/Source/_javascript_Core/wtf/wtf.pri 2011-07-26 21:44:28 UTC (rev 91786)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2011-07-26 21:49:03 UTC (rev 91787)
@@ -42,9 +42,11 @@
wtf/unicode/UTF8.cpp
linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- DEFINES += ENABLE_GLIB_SUPPORT=1
- PKGCONFIG += glib-2.0 gio-2.0
- CONFIG += link_pkgconfig
+ system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+ DEFINES += ENABLE_GLIB_SUPPORT=1
+ PKGCONFIG += glib-2.0 gio-2.0
+ CONFIG += link_pkgconfig
+ }
}
unix:!symbian: SOURCES += wtf/OSAllocatorPosix.cpp
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
