[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 7a1ec1623c5e31cc33399f594c932eece7bd01ab
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 16:34:18 2010 +0000

    2010-09-01  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Need to check LibSoup version
            https://bugs.webkit.org/show_bug.cgi?id=44658
    
            Add version check of LibSoup.
    
            * cmake/FindLibSoup2.cmake:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 06d4b48..c75cc87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-01  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Need to check LibSoup version
+        https://bugs.webkit.org/show_bug.cgi?id=44658
+
+        Add version check of LibSoup.
+
+        * cmake/FindLibSoup2.cmake:
+
 2010-08-31  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Martin Robinson.
diff --git a/cmake/FindLibSoup2.cmake b/cmake/FindLibSoup2.cmake
index 955066c..e023a63 100644
--- a/cmake/FindLibSoup2.cmake
+++ b/cmake/FindLibSoup2.cmake
@@ -63,6 +63,11 @@
 
 INCLUDE( FindPkgConfig )
 
+IF ( LibSoup2_FIND_VERSION AND NOT LIBSOUP2_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
+	SET( LIBSOUP2_MIN_VERSION "${LibSoup2_FIND_VERSION}" )
+	SET( LIBSOUP24_MIN_VERSION "${LibSoup2_FIND_VERSION}" )
+ENDIF ( LibSoup2_FIND_VERSION AND NOT LIBSOUP2_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
+
 IF ( LibSoup2_FIND_REQUIRED )
 	SET( _pkgconfig_REQUIRED "REQUIRED" )
 ELSE( LibSoup2_FIND_REQUIRED )
@@ -89,14 +94,14 @@ IF ( LIBSOUP24_MIN_VERSION )
 ENDIF ( LIBSOUP24_MIN_VERSION )	
 
 # try to find any version of libsoup2.4 if LIBSOUP22_MIN_VERSION is not set
-IF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION )
+IF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
 	PKG_SEARCH_MODULE( LIBSOUP24 libsoup-2.4 libsoup2 )
-ENDIF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION)
+ENDIF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
 
 # try to find any version of libsoup2.2 if LIBSOUP24_MIN_VERSION is not set
-IF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION )
+IF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
 	PKG_SEARCH_MODULE( LIBSOUP22 libsoup-2.2 libsoup2 )
-ENDIF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION)
+ENDIF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
 
 # set LIBSOUP2_ variables
 IF ( LIBSOUP24_FOUND )
@@ -115,7 +120,7 @@ ELSEIF ( LIBSOUP22_FOUND )
 ELSEIF( PKG_CONFIG_FOUND AND LibSoup2_FIND_REQUIRED )
 	# raise an error if both libs are not found 
 	# and FIND_PACKAGE( LibSoup2 REQUIRED ) was called
-	MESSAGE( SEND_ERROR "package libsoup2 not found" )
+	MESSAGE( FATAL_ERROR "package libsoup2 not found" )
 ENDIF ( LIBSOUP24_FOUND )
 
 IF( NOT LIBSOUP2_FOUND AND NOT PKG_CONFIG_FOUND )

-- 
WebKit Debian packaging