diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 18:08:50 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 18:08:50 +0000 |
| commit | d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e (patch) | |
| tree | 05dbd35b13b4541b539611ed8578efa7d31b6e2d /chrome | |
| parent | 63c73a41a18228493aa443243edb5082b667d50b (diff) | |
| download | chromium_src-d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e.zip chromium_src-d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e.tar.gz chromium_src-d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e.tar.bz2 | |
Linux: fix up use_system_{libxml,libxslt,sqlite3}
http://codereview.chromium.org/164450
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/database_dispatcher_host.cc | 7 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 4 | ||||
| -rw-r--r-- | chrome/common/sqlite_compiled_statement.cc | 7 | ||||
| -rw-r--r-- | chrome/common/sqlite_utils.h | 8 |
4 files changed, 22 insertions, 4 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; |