[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1a1d6bb59bf4ac00511e3e30af9b89088b366cda
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 15:53:04 2010 +0000

    2010-08-14  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [CMake] Move SQL files into a IF (ENABLE_DATABASE) section
            https://bugs.webkit.org/show_bug.cgi?id=43979
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 173baac..32cd8fc 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1303,13 +1303,6 @@ SET(WebCore_SOURCES
     platform/network/ResourceRequestBase.cpp
     platform/network/ResourceResponseBase.cpp
 
-    platform/sql/SQLValue.cpp
-    platform/sql/SQLiteAuthorizer.cpp
-    platform/sql/SQLiteDatabase.cpp
-    platform/sql/SQLiteFileSystem.cpp
-    platform/sql/SQLiteStatement.cpp
-    platform/sql/SQLiteTransaction.cpp
-
     platform/text/Base64.cpp
     platform/text/BidiContext.cpp
     platform/text/LineEnding.cpp
@@ -1536,6 +1529,18 @@ SET(WebCore_SOURCES
     xml/XSLTUnicodeSort.cpp
 )
 
+
+IF (ENABLE_DATABASE)
+    LIST(APPEND WebCore_SOURCES
+        platform/sql/SQLValue.cpp
+        platform/sql/SQLiteAuthorizer.cpp
+        platform/sql/SQLiteDatabase.cpp
+        platform/sql/SQLiteFileSystem.cpp
+        platform/sql/SQLiteStatement.cpp
+        platform/sql/SQLiteTransaction.cpp
+    )
+ENDIF ()
+
 IF (ENABLE_SVG)
     LIST(APPEND WebCore_SOURCES
         ${DERIVED_SOURCES_DIR}/JSSVGElementWrapperFactory.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f3a50b8..463db76 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-14  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [CMake] Move SQL files into a IF (ENABLE_DATABASE) section
+        https://bugs.webkit.org/show_bug.cgi?id=43979
+
+        * CMakeLists.txt:
+
 2010-08-14  Matthew Delaney  <mdelaney at apple.com>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging