From cbfbd9be6b47a5822a3b3cd5ec9f19a82496630e Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Fri, 28 Jun 2013 17:12:39 +0100
Subject: Update to work with libjq branch on github.com/stedolan/jq

---
 setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 130090a..8b5e695 100644
--- a/setup.py
+++ b/setup.py
@@ -28,11 +28,11 @@ class jq_build_ext(build_ext):
         else:    
             subprocess.check_call([
                 "git", "clone",
-                "https://github.com/nicowilliams/jq.git",
+                "https://github.com/stedolan/jq.git",
                 jq_lib_dir
             ])
         
-        # Tested with commit e8643787cf
+        # Tested with commit 37cfc912c1
         command(["git", "checkout", "libjq"])
         command(["mkdir", "-p", "m4"])
         command(["autoreconf", "-i"])
@@ -47,8 +47,9 @@ jq_extension = Extension(
     "jq",
     sources=["jq.c"],
     include_dirs=[jq_lib_dir],
-    libraries=["jq"],
-    library_dirs=[jq_lib_dir],
+    #libraries=["jq"],
+    extra_objects=[os.path.join(jq_lib_dir, ".libs/libjq.a")],
+    #library_dirs=[os.path.join(jq_lib_dir, ".libs")],
 )
 
 setup(
-- 
cgit v1.2.3