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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a2e809aaf1c766aea7d45deea3a50cdf39dcccfc
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 03:37:22 2010 +0000

    2010-11-15  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [CMake] Add additional flags to cmakeconfig.h
            https://bugs.webkit.org/show_bug.cgi?id=49556
    
            * cmake/OptionsEfl.cmake:
            * cmakeconfig.h.cmake:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3ad287d..05ef0b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-15  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [CMake] Add additional flags to cmakeconfig.h
+        https://bugs.webkit.org/show_bug.cgi?id=49556
+
+        * cmake/OptionsEfl.cmake:
+        * cmakeconfig.h.cmake:
+
 2010-11-14  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Reviewed by Martin Robinson.
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index 652d392..ebaab4d 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -59,6 +59,7 @@ WEBKIT_FEATURE(ENABLE_EVENTSOURCE "Enable event source" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FAST_MALLOC "Enable TCmalloc instead of system's allocator" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FAST_MOBILE_SCROLLING "Enable fast mobile scrolling" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_FILTERS "Enable SVG filters" DEFAULT ON SVG)
+WEBKIT_FEATURE(ENABLE_FTPDIR "Enable FTP directory support" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_GEOLOCATION "Enable geolocation" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_GLIB_SUPPORT "Enable Glib support" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_ICONDATABASE "Enable icon database" DEFAULT ON)
@@ -66,6 +67,7 @@ WEBKIT_FEATURE(ENABLE_INSPECTOR "Enable inspector" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_JAVASCRIPT_DEBUGGER "Enable JavaScript debugger" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_JIT "Enable JIT code" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_MATHML "Enable MathML" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_NETSCAPE_PLUGIN_API "Enable Netscape plugin API" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_NOTIFICATIONS "Enable notifications" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_OFFLINE_WEB_APPLICATIONS "Enable offline web applications" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF)
diff --git a/cmakeconfig.h.cmake b/cmakeconfig.h.cmake
index 051adbd..b16b985 100644
--- a/cmakeconfig.h.cmake
+++ b/cmakeconfig.h.cmake
@@ -11,12 +11,15 @@
 #define ENABLE_EVENTSOURCE @ENABLE_EVENTSOURCE_VALUE@
 #define ENABLE_FAST_MOBILE_SCROLLING @ENABLE_FAST_MOBILE_SCROLLING_VALUE@
 #define ENABLE_FILTERS @ENABLE_FILTERS_VALUE@
+#define ENABLE_FTPDIR @ENABLE_FTPDIR_VALUE@
 #define ENABLE_GEOLOCATION @ENABLE_GEOLOCATION_VALUE@
 #define ENABLE_GLIB_SUPPORT @ENABLE_GLIB_SUPPORT_VALUE@
 #define ENABLE_ICONDATABASE @ENABLE_ICONDATABASE_VALUE@
+#define ENABLE_INSPECTOR @ENABLE_INSPECTOR_VALUE@
 #define ENABLE_JAVASCRIPT_DEBUGGER @ENABLE_JAVASCRIPT_DEBUGGER_VALUE@
 #define ENABLE_JIT @ENABLE_JIT_VALUE@
 #define ENABLE_MATHML @ENABLE_MATHML_VALUE@
+#define ENABLE_NETSCAPE_PLUGIN_API @ENABLE_NETSCAPE_PLUGIN_API_VALUE@
 #define ENABLE_NOTIFICATIONS @ENABLE_NOTIFICATIONS_VALUE@
 #define ENABLE_OFFLINE_WEB_APPLICATIONS @ENABLE_OFFLINE_WEB_APPLICATIONS_VALUE@
 #define ENABLE_ORIENTATION_EVENTS @ENABLE_ORIENTATION_EVENTS_VALUE@

-- 
WebKit Debian packaging