From 6df3ebfbab4615970e363ad194ad279b5bdd1336 Mon Sep 17 00:00:00 2001
From: "scottbyer@google.com"
 <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 29 Oct 2010 20:30:38 +0000
Subject: Revert 64454 - Revert 64441 - Mac cloud print proxy work.

Turn on use_cups for the Mac, add in the required library, and tweak the code
to get it linking.  There is still more work to do; this is just a gyp-oriented
change to get things started.

BUG=none
TEST=All targets still build on all platforms.

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

TBR=scottbyer@chromium.org
Review URL: http://codereview.chromium.org/4136011

TBR=scottbyer@google.com
Review URL: http://codereview.chromium.org/4137013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64477 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome.gyp                               | 22 ++++++++++++++++------
 chrome/service/cloud_print/print_system_cups.cc |  1 -
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'chrome')

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 961d908..b1e8ebb 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1165,12 +1165,6 @@
           ],
         }],
         ['use_cups==1', {
-          'link_settings': {
-            'libraries': [
-              '-lcups',
-              '-lgcrypt',
-            ],
-          },
           'defines': [
             # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
             # of cloud print system, and allows to use custom implementaiton.
@@ -1179,6 +1173,22 @@
           'sources': [
             'service/cloud_print/print_system_cups.cc',
           ],
+          'conditions': [
+            ['OS=="mac"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/usr/lib/libcups.dylib',
+                ]
+              },
+            }, {
+              'link_settings': {
+                'libraries': [
+                  '-lcups',
+                  '-lgcrypt',
+                ],
+              },
+            }],              
+          ],
         }],
         ['remoting==1', {
           'dependencies': [
diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
index 99e3d1d..12548af 100644
--- a/chrome/service/cloud_print/print_system_cups.cc
+++ b/chrome/service/cloud_print/print_system_cups.cc
@@ -7,7 +7,6 @@
 #include <cups/cups.h>
 #include <dlfcn.h>
 #include <errno.h>
-#include <gcrypt.h>
 #include <pthread.h>
 
 #include <list>
-- 
cgit v1.1