From 258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9 Mon Sep 17 00:00:00 2001
From: "sadrul@chromium.org"
 <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 21 Sep 2011 00:17:19 +0000
Subject: Reland 102005 and 102009: aura: Explicitly disable GTK.

Explicitly disable GTK by setting TOOLKIT_USES_GTK. This is the first in a
series of changes required to have chrome on aura build and link without GTK.
This CL makes base/ build without GTK. Subsequent CLs will do this for other
components.

TBR=evan@chromium.org
BUG=97131
TEST=none

Review URL: http://codereview.chromium.org/7983022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102058 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/linux/system.gyp | 50 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 13 deletions(-)

(limited to 'build/linux/system.gyp')

diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 7578552..688903f 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -468,19 +468,43 @@
     {
       'target_name': 'glib',
       'type': 'settings',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(<(pkg-config) --cflags glib-2.0)',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)',
-        ],
-        'libraries': [
-          '<!@(<(pkg-config) --libs-only-l glib-2.0)',
-        ],
-      },
+      'toolsets': ['host', 'target'],
+      'conditions': [
+        ['_toolset=="target"', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags glib-2.0)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l glib-2.0)',
+            ],
+          },
+        }, {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(pkg-config --cflags glib-2.0)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0)',
+            ],
+            'libraries': [
+              '<!@(pkg-config --libs-only-l glib-2.0)',
+            ],
+          },
+        }],
+        ['chromeos==1', {
+          'link_settings': {
+            'libraries': [ '-lXtst' ]
+          }
+        }],
+      ],
     },
     {
       'target_name': 'libresolv',
-- 
cgit v1.1