[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[jmalonzo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6ba7f95ccbaa667d3cd3b59caa5877b4fca2e341
Author: jmalonzo at webkit.org <jmalonzo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 12 11:55:57 2009 +0000

    2009-10-12  Jan Michael Alonzo  <jmalonzo at webkit.org>
    
            Reviewed by Gustavo Noronha.
    
            [Gtk] Use the SQLite3 headers from WebKitLibraries if sqlite3 is undetected
            https://bugs.webkit.org/show_bug.cgi?id=29518
    
            * configure.ac:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ca8313e..67180e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-12  Jan Michael Alonzo  <jmalonzo at webkit.org>
+
+        Reviewed by Gustavo Noronha.
+
+        [Gtk] Use the SQLite3 headers from WebKitLibraries if sqlite3 is undetected
+        https://bugs.webkit.org/show_bug.cgi?id=29518
+
+        * configure.ac:
+
 2009-10-05  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/configure.ac b/configure.ac
index 1096dc4..7638a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -656,7 +656,15 @@ if test "$enable_icon_database" = "yes" || \
    test "$enable_database" = "yes" || \
    test "$enable_offline_web_applications" = "yes" || \
    test "$enable_dom_storage" = "yes"; then
-   PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION])
+   PKG_CHECK_MODULES([SQLITE3],
+                     [sqlite3 >= $SQLITE_REQUIRED_VERSION],
+                     [sqlite3_has_pkg_config=yes],
+                     [sqlite3_has_pkg_config=no])
+   if test "$sqlite3_has_pkg_config" = "no"; then
+      AC_SEARCH_LIBS([sqlite3_open16], [sqlite3],
+                     [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
+                     [AC_MSG_ERROR([SQLite3 is required to enable Database support])])
+   fi
    AC_SUBST([SQLITE3_CFLAGS])
    AC_SUBST([SQLITE3_LIBS])
 fi

-- 
WebKit Debian packaging