[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[christian at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c12dd9013dd4e71dc84f96e417fd24601571d78c
Author: christian at webkit.org <christian at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 16:36:47 2009 +0000

    2009-12-08  Christian Dywan  <christian at twotoasts.de>
    
            Reviewed by Xan Lopez.
    
            * configure.ac: Require only libSoup 2.27.91 but check for 2.29.3
            and define HAVE_LIBSOUP_2_29_3 in that case.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 28031c2..f39bc80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-08  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Xan Lopez.
+
+        * configure.ac: Require only libSoup 2.27.91 but check for 2.29.3
+        and define HAVE_LIBSOUP_2_29_3 in that case.
+
 2009-12-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Rubber-stamped by Xan Lopez.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4237833..7c9e02a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-08  Christian Dywan  <christian at twotoasts.de>
+
+        Reviewed by Xan Lopez.
+
+        * platform/network/soup/DNSSoup.cpp:
+        (WebCore::prefetchDNS): Conditionalize prefetching on
+        the libSoup version.
+
 2009-12-08  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Rubber-stamped by Maciej Stachowiak.
diff --git a/WebCore/platform/network/soup/DNSSoup.cpp b/WebCore/platform/network/soup/DNSSoup.cpp
index 897bd1f..ce55143 100644
--- a/WebCore/platform/network/soup/DNSSoup.cpp
+++ b/WebCore/platform/network/soup/DNSSoup.cpp
@@ -34,10 +34,12 @@ namespace WebCore {
 
 void prefetchDNS(const String& hostname)
 {
+    #ifdef HAVE_LIBSOUP_2_29_3
     String uri = "http://"+hostname;
     SoupURI* soupUri = soup_uri_new(uri.utf8().data());
     soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupUri);
     soup_uri_free(soupUri);
+    #endif
 }
 
 }
diff --git a/configure.ac b/configure.ac
index f7892b4..d2877c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@ if test "$with_hildon" = "yes"; then
 fi
 
 # minimum base dependencies
-LIBSOUP_REQUIRED_VERSION=2.29.3
+LIBSOUP_REQUIRED_VERSION=2.27.91
 CAIRO_REQUIRED_VERSION=1.6
 FONTCONFIG_REQUIRED_VERSION=2.4
 FREETYPE2_REQUIRED_VERSION=9.0
@@ -635,6 +635,15 @@ PKG_CHECK_MODULES([LIBSOUP],
 AC_SUBST([LIBSOUP_CFLAGS])
 AC_SUBST([LIBSOUP_LIBS])
 
+# check if we can use libSoup 2.29.3 features
+PKG_CHECK_MODULES([LIBSOUP_2_29_3],
+                  [libsoup-2.4 >= 2.29.3],
+                  [have_libsoup_2_29_3=yes],
+                  [have_libsoup_2_29_3=no])
+if test "$have_libsoup_2_29_3" = "yes"; then
+   AC_DEFINE([HAVE_LIBSOUP_2_29_3], 1, [Whether libSoup 2.29.3 features are available])
+fi
+
 # check if FreeType/FontConfig are available
 if test "$with_font_backend" = "freetype"; then
    if test "$with_target" = "directfb"; then

-- 
WebKit Debian packaging