summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/renderer_host/database_dispatcher_host.cc7
-rw-r--r--chrome/chrome.gyp4
-rw-r--r--chrome/common/sqlite_compiled_statement.cc7
-rw-r--r--chrome/common/sqlite_utils.h8
-rw-r--r--third_party/libxml/libxml.gyp10
-rw-r--r--third_party/libxslt/libxslt.gyp7
-rw-r--r--third_party/sqlite/sqlite.gyp13
-rw-r--r--webkit/default_plugin/plugin_database_handler.cc10
8 files changed, 54 insertions, 12 deletions
diff --git a/chrome/browser/renderer_host/database_dispatcher_host.cc b/chrome/browser/renderer_host/database_dispatcher_host.cc
index 0e182da..abf55fb 100644
--- a/chrome/browser/renderer_host/database_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/database_dispatcher_host.cc
@@ -8,6 +8,12 @@
#include <windows.h>
#endif
+#if defined(USE_SYSTEM_SQLITE)
+#include <sqlite3.h>
+#else
+#include "third_party/sqlite/preprocessed/sqlite3.h"
+#endif
+
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/message_loop.h"
@@ -20,7 +26,6 @@
#include "chrome/browser/renderer_host/resource_message_filter.h"
#include "chrome/common/render_messages.h"
#include "ipc/ipc_message.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
const int kNumDeleteRetries = 5;
const int kDelayDeleteRetryMs = 100;
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index e9b830d..4b286b4 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -334,6 +334,7 @@
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
'../third_party/npapi/npapi.gyp:npapi',
'../webkit/webkit.gyp:glue',
@@ -552,6 +553,9 @@
'dependencies': [
'../build/linux/system.gyp:gtk',
],
+ 'export_dependent_settings': [
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ ],
'link_settings': {
'libraries': [
'-lX11',
diff --git a/chrome/common/sqlite_compiled_statement.cc b/chrome/common/sqlite_compiled_statement.cc
index 9449818..93b0d67 100644
--- a/chrome/common/sqlite_compiled_statement.cc
+++ b/chrome/common/sqlite_compiled_statement.cc
@@ -4,10 +4,15 @@
#include "chrome/common/sqlite_compiled_statement.h"
+#if defined(USE_SYSTEM_SQLITE)
+#include <sqlite3.h>
+#else
+#include "third_party/sqlite/preprocessed/sqlite3.h"
+#endif
+
#include "base/logging.h"
#include "base/stl_util-inl.h"
#include "chrome/common/sqlite_utils.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
// SqliteStatementCache -------------------------------------------------------
diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h
index 33915d1..b228030 100644
--- a/chrome/common/sqlite_utils.h
+++ b/chrome/common/sqlite_utils.h
@@ -8,13 +8,17 @@
#include <string>
#include <vector>
+#if defined(USE_SYSTEM_SQLITE)
+#include <sqlite3.h>
+#else
+#include "third_party/sqlite/preprocessed/sqlite3.h"
+#endif
+
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "base/string16.h"
#include "base/string_util.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-
// forward declarations of classes defined here
class FilePath;
class SQLTransaction;
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 84fb755..50528ad 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -22,12 +22,18 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python ../../build/linux/pkg_config_wrapper.py --cflags libxml-2.0)',
+ '<!@(pkg-config --cflags libxml-2.0)',
+ ],
+ 'defines': [
+ 'USE_SYSTEM_LIBXML',
],
},
'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
+ ],
'libraries': [
- '<!@(python ../../build/linux/pkg_config_wrapper.py --libs libxml-2.0)',
+ '<!@(pkg-config --libs-only-l libxml-2.0)',
],
},
}, { # else: OS != "linux" or ! use_system_libxml
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index f775d4b..76f6091 100644
--- a/third_party/libxslt/libxslt.gyp
+++ b/third_party/libxslt/libxslt.gyp
@@ -22,12 +22,15 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python ../../build/linux/pkg_config_wrapper.py --cflags libxslt)',
+ '<!@(pkg-config --cflags libxslt)',
],
},
'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other libxslt)',
+ ],
'libraries': [
- '<!@(python ../../build/linux/pkg_config_wrapper.py --libs libxslt)',
+ '<!@(pkg-config --libs-only-l libxslt)',
],
},
}, { # else: OS != "linux" or ! use_system_libxslt
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index a725754..4a4d869 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -5,6 +5,7 @@
{
'variables': {
'use_system_sqlite%': 0,
+ 'required_sqlite_version': '3.6.1',
},
'includes': [
'../../build/common.gypi',
@@ -27,12 +28,20 @@
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
- '<!@(python ../../build/linux/pkg_config_wrapper.py --cflags sqlite)',
+ '<!@(pkg-config --cflags --atleast-version=<(required_sqlite_version) sqlite3)',
+ ],
+ },
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'USE_SYSTEM_SQLITE',
],
},
'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --atleast-version=<(required_sqlite_version) --libs-only-L --libs-only-other sqlite3)',
+ ],
'libraries': [
- '<!@(python ../../build/linux/pkg_config_wrapper.py --libs sqlite)',
+ '<!@(pkg-config --atleast-version=<(required_sqlite_version) --libs-only-l sqlite3)',
],
},
}, { # else: OS != "linux" or ! use_system_sqlite
diff --git a/webkit/default_plugin/plugin_database_handler.cc b/webkit/default_plugin/plugin_database_handler.cc
index 0d76084..9e90939 100644
--- a/webkit/default_plugin/plugin_database_handler.cc
+++ b/webkit/default_plugin/plugin_database_handler.cc
@@ -4,12 +4,18 @@
#include "webkit/default_plugin/plugin_database_handler.h"
+#if defined(USE_SYSTEM_LIBXML)
+#include <parser.h>
+#include <xpath.h>
+#else
+#include "third_party/libxml/include/libxml/parser.h"
+#include "third_party/libxml/include/libxml/xpath.h"
+#endif
+
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/time.h"
-#include "third_party/libxml/include/libxml/parser.h"
-#include "third_party/libxml/include/libxml/xpath.h"
#include "webkit/default_plugin/plugin_impl.h"
#include "webkit/default_plugin/plugin_main.h"
generated by cgit v1.1 at 2025-03-01 19:36:17 +0000