[WinCairo] Correct improper identification of WKQC extensions.
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Oct 2011 05:16:02 +0000 (05:16 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Oct 2011 05:16:02 +0000 (05:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=69600

* DerivedSources.make: Make sure we are not building the
WinCairo variant.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@96904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.make

index f3b2d4b..59d90e9 100644 (file)
@@ -1,3 +1,11 @@
+2011-10-06  Brent Fulgham  <bfulgham@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  <andersca@apple.com>
 
         When building with clang, enable -Wglobal-constructors and -Wexit-time-destructors
index 4cd11ae..1853296 100644 (file)
@@ -114,6 +114,6 @@ ifeq ($(OS),Windows_NT)
 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