| Index: build/linux/system.gyp
|
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp
|
| index 4a7e857efc15370f94a8d2950db4a17eee03dcf6..ab856f47f22a00922fce6da6254746b4f72f24d1 100644
|
| --- a/build/linux/system.gyp
|
| +++ b/build/linux/system.gyp
|
| @@ -156,19 +156,30 @@
|
| 'type': 'none',
|
| 'conditions': [
|
| ['_toolset=="target"', {
|
| - 'direct_dependent_settings': {
|
| - 'cflags': [
|
| - '<!@(<(pkg-config) --cflags fontconfig)',
|
| - ],
|
| - },
|
| - 'link_settings': {
|
| - 'ldflags': [
|
| - '<!@(<(pkg-config) --libs-only-L --libs-only-other fontconfig)',
|
| - ],
|
| - 'libraries': [
|
| - '<!@(<(pkg-config) --libs-only-l fontconfig)',
|
| - ],
|
| - },
|
| + 'conditions': [
|
| + ['use_system_fontconfig==1', {
|
| + 'direct_dependent_settings': {
|
| + 'cflags': [
|
| + '<!@(<(pkg-config) --cflags fontconfig)',
|
| + ],
|
| + },
|
| + 'link_settings': {
|
| + 'ldflags': [
|
| + '<!@(<(pkg-config) --libs-only-L --libs-only-other fontconfig)',
|
| + ],
|
| + 'libraries': [
|
| + '<!@(<(pkg-config) --libs-only-l fontconfig)',
|
| + ],
|
| + },
|
| + }, { # use_system_fontconfig==0
|
| + 'dependencies': [
|
| + '../../third_party/fontconfig/fontconfig.gyp:fontconfig',
|
| + ],
|
| + 'export_dependent_settings' : [
|
| + '../../third_party/fontconfig/fontconfig.gyp:fontconfig',
|
| + ],
|
| + }],
|
| + ],
|
| }],
|
| ],
|
| },
|
|
|