diff options
| author | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-20 16:50:56 +0000 |
|---|---|---|
| committer | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-20 16:50:56 +0000 |
| commit | 861c6c6d56add9157e04aa2ac43bec8e33bf1cc1 (patch) | |
| tree | 835dd6466912cd073e3ac16177252fe0c8865c93 /build | |
| parent | bc1529bbafc42d96d9ac0839bcb0ba1ab9328445 (diff) | |
| download | chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.zip chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.tar.gz chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.tar.bz2 | |
ProxyConfigService for Linux.
Establishes a ProxyConfig by reading settings from gconf or consulting
environment variables.
BUG=8143
Thanks to ermilov.maxim@gmail.com for his contribution: some ideas<
and code snippets from his patch were folded into this one.
(See http://codereview.chromium.org/49009)
Review URL: http://codereview.chromium.org/60009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/install-build-deps.sh | 2 | ||||
| -rw-r--r-- | build/linux/system.gyp | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 5eed3bf..3031591 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -23,7 +23,7 @@ fi # Packages need for development dev_list="subversion pkg-config python perl g++ g++-multilib bison flex gperf libnss3-dev libglib2.0-dev libgtk2.0-dev libnspr4-dev libsqlite3-dev - wdiff lighttpd php5-cgi msttcorefonts sun-java6-fonts" + wdiff lighttpd php5-cgi msttcorefonts sun-java6-fonts libgconf2-dev" # Full list of required run-time libraries lib_list="libatk1.0-0 libc6 libcairo2 libexpat1 libfontconfig1 libfreetype6 diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 44ac4ea..46bf22c 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -89,5 +89,22 @@ ], }, }, + { + 'target_name': 'gconf', + 'type': 'settings', + 'direct_dependent_settings': { + 'cflags': [ + '<!@(python pkg_config_wrapper.py --cflags gconf-2.0)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(python pkg_config_wrapper.py --libs-only-L --libs-only-other gconf-2.0)', + ], + 'libraries': [ + '<!@(python pkg_config_wrapper.py --libs-only-l gconf-2.0)', + ], + }, + }, ], } |