Make sure the 'use_system_*' variables are actually visible in the relevant gyp files.

Retrying r34195, this time without libxslt, since we don't want to use the
system version of that if we're not also using system libxml (merged from
http://codereview.chromium.org/481011).

BUG=29738

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34255 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 47 insertions, 25 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 8261c9e..a4788c4 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -44,20 +44,6 @@
           # hosts should pass an explicit target_arch to gyp.
           'target_arch%':
             '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")',
-
-          # On Linux, we use the system versions of several libraries. We end
-          # up pulling these in as .so's anyway since they are already in our
-          # transitive closure due to GTK.
-          'use_system_zlib': 1,
-          'use_system_libjpeg': 1,
-          'use_system_bzip2': 1,
-          'use_system_libpng': 1,
-          'use_system_libjpeg': 1,
-          'use_system_libxslt': 1,
-
-          # We use our own copy of libssl, although we still need to link
-          # against the rest of NSS.
-          'use_system_ssl': 0,
         }, {  # OS!="linux"
           'target_arch%': 'ia32',
         }],
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 02bff1d..62da141 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -110,10 +110,10 @@ fi
 
 # Packages need for development
 dev_list="apache2 bison fakeroot flex g++ g++-multilib gperf libapache2-mod-php5
-          libasound2-dev libcairo2-dev libgconf2-dev libglib2.0-dev
-          libgtk2.0-dev libnspr4-dev libnss3-dev libsqlite3-dev lighttpd
-          msttcorefonts patch perl php5-cgi pkg-config python rpm subversion
-          wdiff"
+          libasound2-dev libbz2-dev libcairo2-dev libgconf2-dev libglib2.0-dev
+          libgtk2.0-dev libjpeg62-dev libnspr4-dev libnss3-dev libsqlite3-dev
+          libxslt1-dev lighttpd msttcorefonts patch perl php5-cgi pkg-config
+          python rpm subversion wdiff"
 
 # Full list of required run-time libraries
 lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libexpat1
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index a707343..c51d0a7 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -13,11 +13,19 @@
         'pkg-config': 'pkg-config'
       },
     }],
+    [ 'OS=="linux"', {
+      'variables': {
+        # We use our own copy of libssl, although we still need to link against
+        # the rest of NSS.
+        'use_system_ssl%': 0,
+      },
+    }, {  # OS!="linux"
+      'variables': {
+        'use_system_ssl%': 1,
+      },
+    }],
   ],
 
-  'variables': {
-    'use_system_ssl%': 1,
-  },
 
   'targets': [
     {
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index 8bf3b31..c0f36e0 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -4,7 +4,14 @@
 
 {
   'variables': {
-    'use_system_bzip2%': 0,
+    'conditions': [
+      [ 'OS=="linux"', {
+        # Link to system .so since we already use it due to GTK.
+        'use_system_bzip2%': 1,
+      }, {  # OS!="linux"
+        'use_system_bzip2%': 0,
+      }],
+    ],
   },
   'conditions': [
     ['use_system_bzip2==0', {
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index c0259d6..1b0798b 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -4,7 +4,14 @@
 
 {
   'variables': {
-    'use_system_libjpeg%': 0,
+    'conditions': [
+      [ 'OS=="linux"', {
+        # Link to system .so since we already use it due to GTK.
+        'use_system_libjpeg%': 1,
+      }, {  # OS!="linux"
+        'use_system_libjpeg%': 0,
+      }],
+    ],
   },
   'conditions': [
     ['use_system_libjpeg==0', {
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index 6093d5f..1387b18 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -4,7 +4,14 @@
 
 {
   'variables': {
-    'use_system_libpng%': 0,
+    'conditions': [
+      [ 'OS=="linux"', {
+        # Link to system .so since we already use it due to GTK.
+        'use_system_libpng%': 1,
+      }, {  # OS!="linux"
+        'use_system_libpng%': 0,
+      }],
+    ],
   },
   'conditions': [
     ['use_system_libpng==0', {
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 44e1f8b..36613a7 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -4,7 +4,14 @@
 
 {
   'variables': {
-    'use_system_zlib%': 0,
+    'conditions': [
+      [ 'OS=="linux"', {
+        # Link to system .so since we already use it due to GTK.
+        'use_system_zlib%': 1,
+      }, {  # OS!="linux"
+        'use_system_zlib%': 0,
+      }],
+    ],
   },
   'conditions': [
     ['use_system_zlib==0', {