Title: [96904] trunk/Source/WebKit2
- Revision
- 96904
- Author
- bfulg...@webkit.org
- Date
- 2011-10-06 22:16:02 -0700 (Thu, 06 Oct 2011)
Log Message
[WinCairo] Correct improper identification of WKQC extensions.
https://bugs.webkit.org/show_bug.cgi?id=69600
* DerivedSources.make: Make sure we are not building the
WinCairo variant.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96903 => 96904)
--- trunk/Source/WebKit2/ChangeLog 2011-10-07 04:33:34 UTC (rev 96903)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-07 05:16:02 UTC (rev 96904)
@@ -1,3 +1,11 @@
+2011-10-06 Brent Fulgham <bfulg...@webkit.org>
+
+ [WinCairo] Correct improper identification of WKQC extensions.
+ https://bugs.webkit.org/show_bug.cgi?id=69600
+
+ * DerivedSources.make: Make sure we are not building the
+ WinCairo variant.
+
2011-10-06 Anders Carlsson <ander...@apple.com>
When building with clang, enable -Wglobal-constructors and -Wexit-time-destructors
Modified: trunk/Source/WebKit2/DerivedSources.make (96903 => 96904)
--- trunk/Source/WebKit2/DerivedSources.make 2011-10-07 04:33:34 UTC (rev 96903)
+++ trunk/Source/WebKit2/DerivedSources.make 2011-10-07 05:16:02 UTC (rev 96904)
@@ -114,6 +114,6 @@
all : HeaderDetection.h
HeaderDetection.h : DerivedSources.make
- if [ -f "$(WEBKITLIBRARIESDIR)/include/WebKitQuartzCoreAdditions/WebKitQuartzCoreAdditionsBase.h" ]; then echo "#define HAVE_WKQCA 1" > $@; else echo > $@; fi
+ if [ -f "$(WEBKITLIBRARIESDIR)/include/WebKitQuartzCoreAdditions/WebKitQuartzCoreAdditionsBase.h" ] && [ ! -f "$(WEBKITLIBRARIESDIR)/include/cairo/cairo.h" ]; then echo "#define HAVE_WKQCA 1" > $@; else echo > $@; fi
endif # Windows_NT
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
