Linux: add GYP flag to build with system zlib.

This follows the general style of r21663, which we agreed was the way
to do this.

Note that, currently, one cannot build with system zlib on a 64-bit
system since it's missing a symlink to libz.so in /usr/lib32.

http://codereview.chromium.org/164027


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

12 files changed, 151 insertions, 72 deletions

diff --git a/net/base/gzip_filter.cc b/net/base/gzip_filter.cc
index 3212e89..a595442 100644
--- a/net/base/gzip_filter.cc
+++ b/net/base/gzip_filter.cc
@@ -4,9 +4,20 @@
 
 #include "net/base/gzip_filter.h"
 
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#define MOZ_Z_inflate inflate
+#define MOZ_Z_inflateEnd inflateEnd
+#define MOZ_Z_inflateInit2_ inflateInit2_
+#define MOZ_Z_inflateInit_ inflateInit_
+#define MOZ_Z_inflateReset inflateReset
+#else
+#include "third_party/zlib/zlib.h"
+#endif
+
 #include "base/logging.h"
 #include "net/base/gzip_header.h"
-#include "third_party/zlib/zlib.h"
+
 
 GZipFilter::GZipFilter(const FilterContext& filter_context)
     : Filter(filter_context),
diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc
index c933014..3b464ea 100644
--- a/net/base/gzip_filter_unittest.cc
+++ b/net/base/gzip_filter_unittest.cc
@@ -5,6 +5,12 @@
 #include <fstream>
 #include <iostream>
 
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
+#endif
+
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
@@ -13,7 +19,6 @@
 #include "net/base/io_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
-#include "third_party/zlib/zlib.h"
 
 namespace {
 
diff --git a/net/base/gzip_header.cc b/net/base/gzip_header.cc
index c5630a6..5b10a71 100644
--- a/net/base/gzip_header.cc
+++ b/net/base/gzip_header.cc
@@ -4,8 +4,13 @@
 
 #include "net/base/gzip_header.h"
 
-#include "base/logging.h"
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
 #include "third_party/zlib/zlib.h"  // for Z_DEFAULT_COMPRESSION
+#endif
+
+#include "base/logging.h"
 
 const uint8 GZipHeader::magic[] = { 0x1f, 0x8b };
 
diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc
index 02dc215..6e9904d 100644
--- a/net/base/sdch_filter_unittest.cc
+++ b/net/base/sdch_filter_unittest.cc
@@ -8,6 +8,12 @@
 #include <string>
 #include <vector>
 
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
+#endif
+
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "net/base/filter.h"
@@ -16,7 +22,6 @@
 #include "net/base/sdch_filter.h"
 #include "net/url_request/url_request_http_job.cc"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/zlib/zlib.h"
 
 //------------------------------------------------------------------------------
 // Provide sample data and compression results with a sample VCDIFF dictionary.
diff --git a/third_party/zlib/contrib/minizip/ioapi.c b/third_party/zlib/contrib/minizip/ioapi.c
index 3916d04..3aad38a 100644
--- a/third_party/zlib/contrib/minizip/ioapi.c
+++ b/third_party/zlib/contrib/minizip/ioapi.c
@@ -10,12 +10,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* NOTE(erikkay): this modification was needed to avoid picking up the system
-   version of zlib.h on the Mac */
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
 #include "third_party/zlib/zlib.h"
-#include "ioapi.h"
-
+#endif
 
+#include "ioapi.h"
 
 /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
 
diff --git a/third_party/zlib/contrib/minizip/mztools.c b/third_party/zlib/contrib/minizip/mztools.c
index 8a50ee4..bc19436 100644
--- a/third_party/zlib/contrib/minizip/mztools.c
+++ b/third_party/zlib/contrib/minizip/mztools.c
@@ -8,7 +8,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "zlib.h"
+
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
+#endif
 #include "unzip.h"
 
 #define READ_8(adr)  ((unsigned char)*(adr))
diff --git a/third_party/zlib/contrib/minizip/mztools.h b/third_party/zlib/contrib/minizip/mztools.h
index eee78dc..4af7a46 100644
--- a/third_party/zlib/contrib/minizip/mztools.h
+++ b/third_party/zlib/contrib/minizip/mztools.h
@@ -11,8 +11,10 @@
 extern "C" {
 #endif
 
-#ifndef _ZLIB_H
-#include "zlib.h"
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
 #endif
 
 #include "unzip.h"
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
index 72d88f2..6f95973 100644
--- a/third_party/zlib/contrib/minizip/unzip.c
+++ b/third_party/zlib/contrib/minizip/unzip.c
@@ -38,9 +38,11 @@ woven in by Terry Thorsen 1/2003.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-/* NOTE(erikkay): this modification was needed to avoid picking up the system
- version of zlib.h on the Mac */
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
 #include "third_party/zlib/zlib.h"
+#endif
 #include "unzip.h"
 
 #ifdef STDC
diff --git a/third_party/zlib/contrib/minizip/unzip.h b/third_party/zlib/contrib/minizip/unzip.h
index b247937..4e75c70 100644
--- a/third_party/zlib/contrib/minizip/unzip.h
+++ b/third_party/zlib/contrib/minizip/unzip.h
@@ -49,8 +49,10 @@
 extern "C" {
 #endif
 
-#ifndef _ZLIB_H
-#include "zlib.h"
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
 #endif
 
 #ifndef _ZLIBIOAPI_H
diff --git a/third_party/zlib/contrib/minizip/zip.c b/third_party/zlib/contrib/minizip/zip.c
index 7fbe002..87b15b6 100644
--- a/third_party/zlib/contrib/minizip/zip.c
+++ b/third_party/zlib/contrib/minizip/zip.c
@@ -14,7 +14,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "zlib.h"
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
+#endif
 #include "zip.h"
 
 #ifdef STDC
diff --git a/third_party/zlib/contrib/minizip/zip.h b/third_party/zlib/contrib/minizip/zip.h
index acacce8..77a2374 100644
--- a/third_party/zlib/contrib/minizip/zip.h
+++ b/third_party/zlib/contrib/minizip/zip.h
@@ -50,8 +50,10 @@
 extern "C" {
 #endif
 
-#ifndef _ZLIB_H
-#include "zlib.h"
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
+#include "third_party/zlib/zlib.h"
 #endif
 
 #ifndef _ZLIBIOAPI_H
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index bcec3a9..922676d 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -6,62 +6,97 @@
   'includes': [
     '../../build/common.gypi',
   ],
-  'targets': [
-    {
-      'target_name': 'zlib',
-      'type': '<(library)',
-      'msvs_guid': '8423AF0D-4B88-4EBF-94E1-E4D00D00E21C',
-      'sources': [
-        'contrib/minizip/ioapi.c',
-        'contrib/minizip/ioapi.h',
-        'contrib/minizip/iowin32.c',
-        'contrib/minizip/iowin32.h',
-        'contrib/minizip/unzip.c',
-        'contrib/minizip/unzip.h',
-        'contrib/minizip/zip.c',
-        'contrib/minizip/zip.h',
-        'adler32.c',
-        'compress.c',
-        'crc32.c',
-        'crc32.h',
-        'deflate.c',
-        'deflate.h',
-        'gzio.c',
-        'infback.c',
-        'inffast.c',
-        'inffast.h',
-        'inffixed.h',
-        'inflate.c',
-        'inflate.h',
-        'inftrees.c',
-        'inftrees.h',
-        'mozzconf.h',
-        'trees.c',
-        'trees.h',
-        'uncompr.c',
-        'zconf.h',
-        'zlib.h',
-        'zutil.c',
-        'zutil.h',
-      ],
-      'include_dirs': [
-        '.',
-        # For contrib/minizip
-        '../..',
+  'variables': {
+    'use_system_zlib%': 0,
+  },
+  'conditions': [
+    ['use_system_zlib==0', {
+      'targets': [
+        {
+          'target_name': 'zlib',
+          'type': '<(library)',
+          'msvs_guid': '8423AF0D-4B88-4EBF-94E1-E4D00D00E21C',
+          'sources': [
+            'contrib/minizip/ioapi.c',
+            'contrib/minizip/ioapi.h',
+            'contrib/minizip/iowin32.c',
+            'contrib/minizip/iowin32.h',
+            'contrib/minizip/unzip.c',
+            'contrib/minizip/unzip.h',
+            'contrib/minizip/zip.c',
+            'contrib/minizip/zip.h',
+            'adler32.c',
+            'compress.c',
+            'crc32.c',
+            'crc32.h',
+            'deflate.c',
+            'deflate.h',
+            'gzio.c',
+            'infback.c',
+            'inffast.c',
+            'inffast.h',
+            'inffixed.h',
+            'inflate.c',
+            'inflate.h',
+            'inftrees.c',
+            'inftrees.h',
+            'mozzconf.h',
+            'trees.c',
+            'trees.h',
+            'uncompr.c',
+            'zconf.h',
+            'zlib.h',
+            'zutil.c',
+            'zutil.h',
+          ],
+          'include_dirs': [
+            '.',
+            # For contrib/minizip
+            '../..',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '.',
+            ],
+          },
+          'conditions': [
+            ['OS!="win"', {
+              'product_name': 'z',
+              'sources!': [
+                'contrib/minizip/iowin32.c'
+              ],
+            }],
+          ],
+        },
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '.',
-        ],
-      },
-      'conditions': [
-        ['OS!="win"', {
-          'product_name': 'z',
-          'sources!': [
-            'contrib/minizip/iowin32.c'
+    }, {
+      'targets': [
+        {
+          'target_name': 'zlib',
+          'type': '<(library)',
+          'direct_dependent_settings': {
+            'defines': [
+              'USE_SYSTEM_ZLIB',
+            ],
+          },
+          'defines': [
+            'USE_SYSTEM_ZLIB',
+          ],
+          'sources': [
+            'contrib/minizip/ioapi.c',
+            'contrib/minizip/ioapi.h',
+            'contrib/minizip/unzip.c',
+            'contrib/minizip/unzip.h',
+            'contrib/minizip/zip.c',
+            'contrib/minizip/zip.h',
           ],
-        }],
+          'link_settings': {
+            'libraries': [
+              '-lz',
+            ],
+          },
+        },
       ],
-    },
+    }],
   ],
 }