summaryrefslogtreecommitdiffstats
path: root/build/linux
diff options
context:
space:
mode:
authorsdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-20 16:50:56 +0000
committersdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-20 16:50:56 +0000
commit861c6c6d56add9157e04aa2ac43bec8e33bf1cc1 (patch)
tree835dd6466912cd073e3ac16177252fe0c8865c93 /build/linux
parentbc1529bbafc42d96d9ac0839bcb0ba1ab9328445 (diff)
downloadchromium_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/linux')
-rw-r--r--build/linux/system.gyp17
1 files changed, 17 insertions, 0 deletions
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)',
+ ],
+ },
+ },
],
}