Don't link against libxml/libxslt unless we really need it.
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Jul 2007 15:30:21 +0000 (15:30 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Jul 2007 15:30:21 +0000 (15:30 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.pro

index d27ce44..c570196 100644 (file)
@@ -1,3 +1,11 @@
+2007-07-30  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Don't link against libxml/libxslt unless we really need it.
+
+        * WebCore.pro:
+
 2007-07-29  Tristan O'Tierney  <tristan@apple.com>
 
         Reviewed by Oliver Hunt.
index f5b0529..f129a93 100644 (file)
@@ -65,15 +65,6 @@ include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
 #INCLUDEPATH += $$PWD/../JavaScriptCore
 #LIBS += -L$$OUTPUT_DIR/lib -lJavaScriptCore
 
-macx {
-    INCLUDEPATH += /usr/include/libxml2
-    LIBS += -lxml2 -lxslt
-}
-
-win32-* {
-    LIBS += -llibxml2 -llibxslt
-}
-
 qt-port {
 !win32-* {
     LIBS += -L$$OUTPUT_DIR/WebKitQt/Plugins
@@ -943,6 +934,15 @@ unix:!mac:CONFIG += link_pkgconfig
 contains(DEFINES, ENABLE_XSLT=1) {
     FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
     PKGCONFIG += libxml-2.0 libxslt
+
+    macx {
+        INCLUDEPATH += /usr/include/libxml2
+        LIBS += -lxml2 -lxslt
+    }
+
+    win32-msvc* {
+        LIBS += -llibxml2 -llibxslt
+    }
 }
 
 contains(DEFINES, ENABLE_XBL=1) {