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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 806a76d667ed32e68a685cfa480f3ba8c2073b0d
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 18:04:50 2010 +0000

    2010-08-17  Martin Robinson  <mrobinson at igalia.com>
    
            GTK+ Build fix for those having stable versions of GLib.
    
            * configure.ac: Only invoke GLIB_GSETTINGS if we have the necessary gio version.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65518 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 3c36583..0bd2662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-17  Martin Robinson  <mrobinson at igalia.com>
+
+        GTK+ Build fix for those having stable versions of GLib.
+
+        * configure.ac: Only invoke GLIB_GSETTINGS if we have the necessary gio version.
+
 2010-08-17  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r65500.
diff --git a/configure.ac b/configure.ac
index 897fd02..0de8985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,6 +267,7 @@ PKG_CHECK_MODULES([GSETTINGS],
                   [have_gsettings=no])
 if test "$have_gsettings" = "yes"; then
    AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings])
+   GLIB_GSETTINGS
 fi
 
 GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
@@ -834,9 +835,6 @@ if test "$enable_geolocation" = "yes"; then
     AC_SUBST([GEOCLUE_LIBS])
 fi
 
-# GSettings
-GLIB_GSETTINGS
-
 # check if gstreamer is available
 if test "$enable_video" = "yes"; then
    PKG_CHECK_MODULES([GSTREAMER],

-- 
WebKit Debian packaging