[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 e0b658032aa1de6629494bac8c62ce650f80944c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 19:55:56 2010 +0000

    2010-07-20  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Enable Ecore-X on compile time
            https://bugs.webkit.org/show_bug.cgi?id=42600
    
            Check for a flag received from cmake configure and disable it
            if necessary. Also disable it if Ecore-X wasn't found.
    
            EFL port does not support automated tests yet.
    
            * cmake/FindEFL.cmake:
            * cmake/OptionsEfl.cmake:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index efa6a7c..f1aec58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Enable Ecore-X on compile time
+        https://bugs.webkit.org/show_bug.cgi?id=42600
+
+        Check for a flag received from cmake configure and disable it
+        if necessary. Also disable it if Ecore-X wasn't found.
+
+        EFL port does not support automated tests yet.
+
+        * cmake/FindEFL.cmake:
+        * cmake/OptionsEfl.cmake:
+
 2010-07-20  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/cmake/FindEFL.cmake b/cmake/FindEFL.cmake
index c2efdcb..cfff96f 100644
--- a/cmake/FindEFL.cmake
+++ b/cmake/FindEFL.cmake
@@ -11,6 +11,6 @@ PKG_CHECK_MODULES (EFLDEPS REQUIRED
   ecore-evas>=0.9.9.063
   edje>=0.9.9.063)
 PKG_CHECK_MODULES (EINA REQUIRED eina-0>=0.9.9.063)
-PKG_CHECK_MODULES (ECORE_X REQUIRED ecore-x>=0.9.9.063)
+PKG_CHECK_MODULES (ECORE_X ecore-x>=0.9.9.063)
 PKG_CHECK_MODULES (EVAS REQUIRED evas>=0.9.9.063)
 
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index 78b9128..3be7bda 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -43,8 +43,6 @@ ENDIF ()
 SET(WTF_USE_FREETYPE 1)
 ADD_DEFINITIONS(-DUSE_FREETYPE=1)
 
-ADD_DEFINITIONS(-DHAVE_ECORE_X)
-
 SET(JSC_EXECUTABLE_NAME jsc)
 SET(WTF_LIBRARY_NAME wtf)
 SET(JavaScriptCore_LIBRARY_NAME javascriptcore)
@@ -88,4 +86,14 @@ WEBKIT_FEATURE(ENABLE_XHTMLMP "Enable XHTMLMP" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_XPATH "Enable XPath" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT ON)
 
+OPTION(ENABLE_ECORE_X "Enable Ecore_X specific usage (cursor, bell)" ON)
+IF (${ENABLE_ECORE_X})
+    IF (ECORE_X_FOUND)
+        MESSAGE(STATUS "Using Ecore-X to provide extended support.")
+        ADD_DEFINITIONS(-DHAVE_ECORE_X)
+    ELSE ()
+        MESSAGE(ERROR "Requested Ecore-X but it was not found!")
+    ENDIF ()
+ENDIF ()
+
 SET(CPACK_SOURCE_GENERATOR TBZ2)

-- 
WebKit Debian packaging