summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>2011-03-26 13:48:37 +0000
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>2011-03-26 13:48:37 +0000
commit7716cc6a0c311fd7032f3345fd86dac6f474195f (patch)
tree2e857851ed4a17a7fdff759a0b159ec5d3a1270a
parent90536a187dbe6bd978d3bfd5a0db5359ad7f78ad (diff)
downloadpsycopg2-7716cc6a0c311fd7032f3345fd86dac6f474195f.tar.gz
Allow to specify --static-libpq on setup.py command line
Patch provided by Matthew Ryan (ticket #48).
-rw-r--r--NEWS2
-rw-r--r--setup.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 8aef82e..b952c27 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ What's new in psycopg 2.4.1
- Use own parser for bytea output, not requiring anymore the libpq 9.0
to parse the hex format.
- Correctly detect an empty query sent to the backend (ticket #46).
+ - Allow to specify --static-libpq on setup.py command line instead of
+ just in 'setup.cfg'. Patch provided by Matthew Ryan (ticket #48).
What's new in psycopg 2.4
diff --git a/setup.py b/setup.py
index 90244a9..17eada1 100644
--- a/setup.py
+++ b/setup.py
@@ -133,6 +133,7 @@ class psycopg_build_ext(build_ext):
self.mx_include_dir = None
self.use_pydatetime = 1
self.have_ssl = have_ssl
+ self.static_libpq = static_libpq
self.pg_config = None
def get_compiler(self):
@@ -263,7 +264,7 @@ or with the pg_config option in 'setup.cfg'.
sys.exit(1)
self.include_dirs.append(".")
- if static_libpq:
+ if self.static_libpq:
if not self.link_objects: self.link_objects = []
self.link_objects.append(
os.path.join(self.get_pg_config("libdir"), "libpq.a"))