Title: [109713] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 109713
- Author
- mrobin...@webkit.org
- Date
- 2012-03-05 00:05:25 -0800 (Mon, 05 Mar 2012)
Log Message
Merging r109396
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (109712 => 109713)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-03-05 08:03:08 UTC (rev 109712)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-03-05 08:05:25 UTC (rev 109713)
@@ -1,3 +1,15 @@
+2012-03-05 Kalev Lember <kalevlem...@gmail.com>
+
+ [GTK] Avoid building any parts of WebKitTestRunner when WK2 is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=80031
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Only build the libTestRunnerInjectedBundle.la convenience library when
+ ENABLE_WEBKIT2 is defined.
+
+ * WebKitTestRunner/GNUmakefile.am:
+
2012-03-04 Kalev Lember <kalevlem...@gmail.com>
Explicitly include unistd.h in TestNetscapePlugIn for GCC 4.7
Modified: releases/WebKitGTK/webkit-1.8/Tools/WebKitTestRunner/GNUmakefile.am (109712 => 109713)
--- releases/WebKitGTK/webkit-1.8/Tools/WebKitTestRunner/GNUmakefile.am 2012-03-05 08:03:08 UTC (rev 109712)
+++ releases/WebKitGTK/webkit-1.8/Tools/WebKitTestRunner/GNUmakefile.am 2012-03-05 08:05:25 UTC (rev 109713)
@@ -62,7 +62,9 @@
-no-install
# The InjectedBundle library allows the render process to load harness code.
+if ENABLE_WEBKIT2
noinst_LTLIBRARIES += Libraries/libTestRunnerInjectedBundle.la
+endif
webkittestrunner_built_sources += \
DerivedSources/InjectedBundle/JSAccessibilityController.cpp \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
