Don't clobber variables that are already set, resulting in a broken build.
authorstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 17:28:27 +0000 (17:28 +0000)
committerstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 17:28:27 +0000 (17:28 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.pro

index d330901ca2e22cc1c741df0a5747552f4b82d5ba..ef386199ef452dd0c986bee6b484b31523e2aa68 100644 (file)
@@ -1,3 +1,9 @@
+2007-07-06  George Staikos  <staikos@kde.org>
+
+        Qt build fix: Don't clobber qmake variables that are already set.
+
+        * WebCore.pro:
+
 2007-07-05  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Antti.
index fe59489521fef0473413b313495e6bd0b2595c18..f5f4efddac1e267f1eb86525db66e5e6c860ac0a 100644 (file)
@@ -36,11 +36,11 @@ freebsd-*: DEFINES += HAVE_PTHREAD_NP_H
 DEFINES += BUILD_WEBKIT
 
 # Optional components (look for defs in config.h and included files!)
-DEFINES += ENABLE_ICONDATABASE=1
-DEFINES += ENABLE_XPATH=1
-DEFINES += ENABLE_XSLT=1
-#DEFINES += ENABLE_XBL=1
-qt-port:DEFINES += ENABLE_SVG=1
+!contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
+!contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
+!contains(DEFINES, ENABLE_XSLT=.): DEFINES += ENABLE_XSLT=1
+#!contains(DEFINES, ENABLE_XBL=.): DEFINES += ENABLE_XBL=1
+qt-port: !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
 gdk-port:DEFINES += ENABLE_SVG=1
 
 DEFINES += WTF_CHANGES=1