[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
philn at webkit.org
philn at webkit.org
Fri Jan 21 14:47:57 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 2e69c919064c4527acc6ddf53c592d9e4b67e742
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 30 10:17:07 2010 +0000
2010-12-29 Philippe Normand <pnormand at igalia.com>
Reviewed by Martin Robinson.
[GTK] minimal build fails at link time due to missing sqlite3 symbols
https://bugs.webkit.org/show_bug.cgi?id=51327
* configure.ac: Error out if SQLite3 wasn't found while at least
one of the features depending on it has been enabled.
WebCore:
Reviewed by Martin Robinson.
[GTK] minimal build fails at link time due to missing sqlite3 symbols
https://bugs.webkit.org/show_bug.cgi?id=51327
Guard the code calling sqlite3 with the ENABLE(DATABASE) check.
No new tests, build fix only.
* platform/sql/SQLiteAuthorizer.cpp:
* platform/sql/SQLiteDatabase.cpp:
* platform/sql/SQLiteFileSystem.cpp:
* platform/sql/SQLiteStatement.cpp:
* platform/sql/SQLiteTransaction.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74792 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index df482c8..998f0a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-29 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] minimal build fails at link time due to missing sqlite3 symbols
+ https://bugs.webkit.org/show_bug.cgi?id=51327
+
+ * configure.ac: Error out if SQLite3 wasn't found while at least
+ one of the features depending on it has been enabled.
+
2010-12-29 Patrick Gansterer <paroga at webkit.org>
Unreviewed. Use gcc as default preprocessor.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7266716..a971545 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-29 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] minimal build fails at link time due to missing sqlite3 symbols
+ https://bugs.webkit.org/show_bug.cgi?id=51327
+
+ Guard the code calling sqlite3 with the ENABLE(DATABASE) check.
+
+ No new tests, build fix only.
+
+ * platform/sql/SQLiteAuthorizer.cpp:
+ * platform/sql/SQLiteDatabase.cpp:
+ * platform/sql/SQLiteFileSystem.cpp:
+ * platform/sql/SQLiteStatement.cpp:
+ * platform/sql/SQLiteTransaction.cpp:
+
2010-12-30 Justin Schuh <jschuh at chromium.org>
Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/sql/SQLiteAuthorizer.cpp b/WebCore/platform/sql/SQLiteAuthorizer.cpp
index f9da260..6fbf79d 100644
--- a/WebCore/platform/sql/SQLiteAuthorizer.cpp
+++ b/WebCore/platform/sql/SQLiteAuthorizer.cpp
@@ -25,9 +25,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#include "config.h"
#include "DatabaseAuthorizer.h"
+#if ENABLE(DATABASE)
#include <sqlite3.h>
namespace WebCore {
@@ -37,3 +39,5 @@ const int SQLAuthIgnore = SQLITE_IGNORE;
const int SQLAuthDeny = SQLITE_DENY;
} // namespace WebCore
+
+#endif // ENABLE(DATABASE)
diff --git a/WebCore/platform/sql/SQLiteDatabase.cpp b/WebCore/platform/sql/SQLiteDatabase.cpp
index fb25889..5bb56ab 100644
--- a/WebCore/platform/sql/SQLiteDatabase.cpp
+++ b/WebCore/platform/sql/SQLiteDatabase.cpp
@@ -27,6 +27,7 @@
#include "config.h"
#include "SQLiteDatabase.h"
+#if ENABLE(DATABASE)
#include "DatabaseAuthorizer.h"
#include "Logging.h"
#include "SQLiteFileSystem.h"
@@ -471,3 +472,5 @@ bool SQLiteDatabase::turnOnIncrementalAutoVacuum()
}
} // namespace WebCore
+
+#endif // ENABLE(DATABASE)
diff --git a/WebCore/platform/sql/SQLiteFileSystem.cpp b/WebCore/platform/sql/SQLiteFileSystem.cpp
index d487b95..362005c 100644
--- a/WebCore/platform/sql/SQLiteFileSystem.cpp
+++ b/WebCore/platform/sql/SQLiteFileSystem.cpp
@@ -32,6 +32,8 @@
#include "config.h"
#include "SQLiteFileSystem.h"
+#if ENABLE(DATABASE)
+
#include "FileSystem.h"
#include "SQLiteDatabase.h"
#include "SQLiteStatement.h"
@@ -123,3 +125,4 @@ long long SQLiteFileSystem::getDatabaseFileSize(const String& fileName)
}
} // namespace WebCore
+#endif // ENABLE(DATABASE)
diff --git a/WebCore/platform/sql/SQLiteStatement.cpp b/WebCore/platform/sql/SQLiteStatement.cpp
index 037ec79..af9518a 100644
--- a/WebCore/platform/sql/SQLiteStatement.cpp
+++ b/WebCore/platform/sql/SQLiteStatement.cpp
@@ -26,6 +26,8 @@
#include "config.h"
#include "SQLiteStatement.h"
+#if ENABLE(DATABASE)
+
#include "Logging.h"
#include "SQLValue.h"
#include <sqlite3.h>
@@ -496,3 +498,5 @@ bool SQLiteStatement::isExpired()
}
} // namespace WebCore
+
+#endif // ENABLE(DATABASE)
diff --git a/WebCore/platform/sql/SQLiteTransaction.cpp b/WebCore/platform/sql/SQLiteTransaction.cpp
index 6f90eac..63b3e7a 100644
--- a/WebCore/platform/sql/SQLiteTransaction.cpp
+++ b/WebCore/platform/sql/SQLiteTransaction.cpp
@@ -26,6 +26,8 @@
#include "config.h"
#include "SQLiteTransaction.h"
+#if ENABLE(DATABASE)
+
#include "SQLiteDatabase.h"
namespace WebCore {
@@ -101,3 +103,4 @@ bool SQLiteTransaction::wasRolledBackBySqlite() const
}
} // namespace WebCore
+#endif // ENABLE(DATABASE)
diff --git a/configure.ac b/configure.ac
index b2ad8cd..72ebe2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -841,22 +841,26 @@ if test "$with_font_backend" = "freetype"; then
AC_SUBST([FREETYPE_LIBS])
fi
-# check if sqlite 3 is available
-if test "$enable_icon_database" = "yes" || \
+# check if SQLite3 is available. Error out only if one of the
+# features hard-depending on it is enabled while SQLite3 is
+# unavailable.
+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_found=yes;SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
+ [sqlite3_found=no])
+fi
+AC_SUBST([SQLITE3_CFLAGS])
+AC_SUBST([SQLITE3_LIBS])
+
+if (test "$sqlite3_found" = "no") && (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],
- [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])
+ test "$enable_dom_storage" = "yes"); then
+ AC_MSG_ERROR([SQLite3 is required for the Database related features])
fi
# check if libxslt is available
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list