From 01934d225411152f48fdff1d3010a5a993d512df Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 16 Mar 2019 00:21:57 -0400
Subject: [PATCH 3/8] Unbundle zstd.

Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
 setup.py | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/setup.py b/setup.py
index 65b9f42..8be8d80 100644
--- a/setup.py
+++ b/setup.py
@@ -104,21 +104,11 @@ def blosc_extension():
 def zstd_extension():
     info('setting up Zstandard extension')
 
-    zstd_sources = []
     extra_compile_args = list(base_compile_args)
-    include_dirs = []
-    define_macros = []
 
     # setup sources - use zstd bundled in blosc
-    zstd_sources += glob('c-blosc/internal-complibs/zstd*/common/*.c')
-    zstd_sources += glob('c-blosc/internal-complibs/zstd*/compress/*.c')
-    zstd_sources += glob('c-blosc/internal-complibs/zstd*/decompress/*.c')
-    zstd_sources += glob('c-blosc/internal-complibs/zstd*/dictBuilder/*.c')
-    include_dirs += [d for d in glob('c-blosc/internal-complibs/zstd*')
-                     if os.path.isdir(d)]
-    include_dirs += [d for d in glob('c-blosc/internal-complibs/zstd*/*')
-                     if os.path.isdir(d)]
-    # define_macros += [('CYTHON_TRACE', '1')]
+    libzstd = pkgconfig('libzstd')
+    extra_compile_args += libzstd[0]
 
     if have_cython:
         sources = ['numcodecs/zstd.pyx']
@@ -128,10 +118,9 @@ def zstd_extension():
     # define extension module
     extensions = [
         Extension('numcodecs.zstd',
-                  sources=sources + zstd_sources,
-                  include_dirs=include_dirs,
-                  define_macros=define_macros,
+                  sources=sources,
                   extra_compile_args=extra_compile_args,
+                  extra_link_args=libzstd[1],
                   ),
     ]
 
-- 
2.20.1