Reland r49135: Linux: enable compiling GNOME Keyring and KWallet integration.

build/linux/system.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'conditions': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
@@ skipping 237 matching lines @@
       'type': 'settings',
       'conditions': [
         ['_toolset=="target"', {
           'link_settings': {
             'libraries': [
               '-lselinux',
             ],
           },
       }]]
     },
-# TODO(evanm): temporarily disabled while we figure out whether to depend
-# on gnome-keyring etc.
-# http://code.google.com/p/chromium/issues/detail?id=12351
-#     {
-#       'target_name': 'gnome-keyring',
-#       'type': 'settings',
-#       'direct_dependent_settings': {
-#         'cflags': [
-#           '<!@(<(pkg-config) --cflags gnome-keyring-1)',
-#         ],
-#       },
-#       'link_settings': {
-#         'ldflags': [
-#           '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
-#         ],
-#         'libraries': [
-#           '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
-#         ],
-#       },
-#     },
-     {
-       'target_name': 'dbus-glib',
-       'type': 'settings',
-       'direct_dependent_settings': {
-         'cflags': [
-           '<!@(<(pkg-config) --cflags dbus-glib-1)',
-         ],
-       },
-       'link_settings': {
-         'ldflags': [
-           '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
-         ],
-         'libraries': [
-           '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
-         ],
-       },
-     },
+    {
+      'target_name': 'gnome-keyring',
+      'type': 'settings',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(<(pkg-config) --cflags gnome-keyring-1)',
+        ],
+        'conditions': [
+          ['linux_link_gnome_keyring==0', {
+            'defines': ['DLOPEN_GNOME_KEYRING'],
+          }],
+        ],
+      },
+      'conditions': [
+        ['linux_link_gnome_keyring!=0', {
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other gnome-keyring-1)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+            ],
+          },
+        }, {
+          'link_settings': {
+            'libraries': [
+              '-ldl',
+            ],
+          },
+        }],
+      ],
+    },
+    {
+      'target_name': 'dbus-glib',
+      'type': 'settings',
+      'direct_dependent_settings': {
+        'cflags': [
+          '<!@(<(pkg-config) --cflags dbus-glib-1)',
+        ],
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
+        ],
+        'libraries': [
+          '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
+        ],
+      },
+    },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: