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

[leandro at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 79a523e5e2ac2372e8309ab56476f74af7bdf024
Author: leandro at webkit.org <leandro at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 17:35:49 2010 +0000

    2010-08-13  Leandro Pereira  <leandro at profusion.mobi>
    
            [EFL] Unreviewed build fix.
    
            * cmake/FindGthread.cmake: Fix warnings about obsolete PKGCONFIG macro.
            * cmake/WebKitGenerators.cmake: FLEX_EXECUTABLE was defined already
            by the root CMakeLists.txt file, so remove relevant lines that
            depends on FIND_PACKAGE_HANDLE_STANDARD_ARGS macro, which isn't
            available anymore.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 72d9107..b2f1a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-13  Leandro Pereira  <leandro at profusion.mobi>
+
+        [EFL] Unreviewed build fix.
+
+        * cmake/FindGthread.cmake: Fix warnings about obsolete PKGCONFIG macro.
+        * cmake/WebKitGenerators.cmake: FLEX_EXECUTABLE was defined already
+        by the root CMakeLists.txt file, so remove relevant lines that
+        depends on FIND_PACKAGE_HANDLE_STANDARD_ARGS macro, which isn't
+        available anymore.
+
 2010-08-13  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/cmake/FindGthread.cmake b/cmake/FindGthread.cmake
index 7dabbee..d52aa5f 100644
--- a/cmake/FindGthread.cmake
+++ b/cmake/FindGthread.cmake
@@ -4,18 +4,5 @@
 # GTHREAD_LIBRARIES   Libraries to link against to use GTHREAD
 # GTHREAD_FOUND       GTHREAD was found
 
-IF (UNIX)
-    INCLUDE (UsePkgConfig)
-    PKGCONFIG (gthread-2.0 GTHREAD_include_dir GTHREAD_link_dir GTHREAD_libraries GTHREAD_include)
-    IF (GTHREAD_include AND GTHREAD_libraries)
-        SET (GTHREAD_FOUND TRUE)
-        EXEC_PROGRAM ("echo"
-            ARGS "${GTHREAD_include} | sed 's/[[:blank:]]*-I/;/g'"
-            OUTPUT_VARIABLE GTHREAD_INCLUDE
-        )
-        SET (GTHREAD_INCLUDE-I ${GTHREAD_include})
-        SET (GTHREAD_LIBRARIES ${GTHREAD_libraries})
-    ELSE (GTHREAD_include AND GTHREAD_libraries)
-        SET (GTHREAD_FOUND FALSE)
-    ENDIF (GTHREAD_include AND GTHREAD_libraries)
-ENDIF (UNIX)
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES (Gthread REQUIRED gthread-2.0>=2.20.0)
diff --git a/cmake/WebKitGenerators.cmake b/cmake/WebKitGenerators.cmake
index 92b83f1..120215c 100644
--- a/cmake/WebKitGenerators.cmake
+++ b/cmake/WebKitGenerators.cmake
@@ -130,12 +130,6 @@ MACRO(GENERATE_DFTABLES)
 ENDMACRO()
 
 
-FIND_PROGRAM(FLEX_EXECUTABLE flex)
-IF (NOT FLEX_EXECUTABLE)
-  MESSAGE(FATAL_ERROR "Missing flex")
-ENDIF ()
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Flex DEFAULT_MSG FLEX_EXECUTABLE)
-
 SET(MAKE_TOKENIZER ${WEBCORE_DIR}/css/maketokenizer)
 # - Create ${DERIVED_SOURCES_DIR}/tokenizer.cpp
 # GENERATE_TOKENIZER()

-- 
WebKit Debian packaging