diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 19:04:50 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 19:04:50 +0000 |
| commit | 7ef52bf5efc171bfe16db94580ea6b3b49691bd3 (patch) | |
| tree | e63dc8e500aa97dbc6a87d0680f3708c00b3cd1c /net | |
| parent | 8c9f3b39071d565c338726109c4a2ac57fc906c6 (diff) | |
| download | chromium_src-7ef52bf5efc171bfe16db94580ea6b3b49691bd3.zip chromium_src-7ef52bf5efc171bfe16db94580ea6b3b49691bd3.tar.gz chromium_src-7ef52bf5efc171bfe16db94580ea6b3b49691bd3.tar.bz2 | |
Linux: add GYP flag to build with system libbz2.
This follows the general style of r21663, which we agreed was the way
to do this.
Note that, currently, one cannot build with system libbz2 on a 64-bit
system since it's not part of the ia32-compat package.
http://codereview.chromium.org/165016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/bzip2_filter.h | 7 | ||||
| -rw-r--r-- | net/base/bzip2_filter_unittest.cc | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/net/base/bzip2_filter.h b/net/base/bzip2_filter.h index e5e88f6..5a9e7b6 100644 --- a/net/base/bzip2_filter.h +++ b/net/base/bzip2_filter.h @@ -20,9 +20,14 @@ #ifndef NET_BASE_BZIP2_FILTER_H_ #define NET_BASE_BZIP2_FILTER_H_ +#if defined(USE_SYSTEM_LIBBZ2) +#include <bzlib.h> +#else +#include "third_party/bzip2/bzlib.h" +#endif + #include "base/scoped_ptr.h" #include "net/base/filter.h" -#include "third_party/bzip2/bzlib.h" class BZip2Filter : public Filter { public: diff --git a/net/base/bzip2_filter_unittest.cc b/net/base/bzip2_filter_unittest.cc index 9b1eab5..7705ebb 100644 --- a/net/base/bzip2_filter_unittest.cc +++ b/net/base/bzip2_filter_unittest.cc @@ -5,6 +5,12 @@ #include <fstream> #include <iostream> +#if defined(USE_SYSTEM_LIBBZ2) +#include <bzlib.h> +#else +#include "third_party/bzip2/bzlib.h" +#endif + #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_ptr.h" @@ -13,7 +19,6 @@ #include "net/base/io_buffer.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" -#include "third_party/bzip2/bzlib.h" namespace { |