1 files changed, 56 insertions, 29 deletions
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index c9f59de..dd493b0 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -6,35 +6,62 @@
   'includes': [
     '../../build/common.gypi',
   ],
-  'targets': [
-    {
-      'target_name': 'bzip2',
-      'type': '<(library)',
-      'defines': ['BZ_NO_STDIO'],
-      'msvs_guid': '2A70CBF0-847E-4E3A-B926-542A656DC7FE',
-      'sources': [
-        'blocksort.c',
-        'bzlib.c',
-        'bzlib.h',
-        'bzlib_private.h',
-        'compress.c',
-        'crctable.c',
-        'decompress.c',
-        'huffman.c',
-        'randtable.c',
+  'variables': {
+    'use_system_bzip2%': 0,
+  },
+  'conditions': [
+    ['use_system_bzip2==0', {
+      'targets': [
+        {
+          'target_name': 'bzip2',
+          'type': '<(library)',
+          'defines': ['BZ_NO_STDIO'],
+          'msvs_guid': '2A70CBF0-847E-4E3A-B926-542A656DC7FE',
+          'sources': [
+            'blocksort.c',
+            'bzlib.c',
+            'bzlib.h',
+            'bzlib_private.h',
+            'compress.c',
+            'crctable.c',
+            'decompress.c',
+            'huffman.c',
+            'randtable.c',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '.',
+            ],
+          },
+          'conditions': [
+            ['OS=="win"', {
+              'product_name': 'libbzip2',
+            }, {  # else: OS!="win"
+              'product_name': 'bz2',
+            }],
+          ],
+        },
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '.',
-        ],
-      },
-      'conditions': [
-        ['OS=="win"', {
-          'product_name': 'libbzip2',
-        }, {  # else: OS!="win"
-          'product_name': 'bz2',
-        }],
-      ],
-    },
+    }, {
+      'targets': [
+        {
+          'target_name': 'bzip2',
+          'type': 'settings',
+
+          'direct_dependent_settings': {
+            'defines': [
+              'USE_SYSTEM_LIBBZ2',
+            ],
+          },
+
+          # There aren't any pkg-config files for libbz2
+          'link_settings': {
+            'libraries': [
+              '-lbz2',
+            ],
+          },
+        },
+      ]
+    }],
   ],
 }