psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-23 01:16:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-453'

Browse Source
This commit is contained in:
Daniele Varrazzo 2016-12-25 19:56:40 +01:00
commit 1c3e2be224
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup.cfg
View File

@ -7,24 +7,23 @@ define=
# "pg_config" is required to locate PostgreSQL headers and libraries needed to # "pg_config" is required to locate PostgreSQL headers and libraries needed to
# build psycopg2. If pg_config is not in the path or is installed under a # build psycopg2. If pg_config is not in the path or is installed under a
# different name uncomment the following option and set it to the pg_config # different name set the following option to the pg_config full path.
# full path. pg_config=
#pg_config=
# Set to 1 to use Python datetime objects for default date/time representation. # Set to 1 to use Python datetime objects for default date/time representation.
use_pydatetime=1 use_pydatetime=1
# If the build system does not find the mx.DateTime headers, try # If the build system does not find the mx.DateTime headers, try
# uncommenting the following line and setting its value to the right path. # setting its value to the right path.
#mx_include_dir= mx_include_dir=
# For Windows only: # For Windows only:
# Set to 1 if the PostgreSQL library was built with OpenSSL. # Set to 1 if the PostgreSQL library was built with OpenSSL.
# Required to link in OpenSSL libraries and dependencies. # Required to link in OpenSSL libraries and dependencies.
have_ssl=0 have_ssl=0
# Statically link against the postgresql client library. # Set to 1 to statically link against the postgresql client library.
#static_libpq=1 static_libpq=0
# Add here eventual extra libraries required to link the module. # Add here eventual extra libraries required to link the module.
#libraries= libraries=

7
setup.py
View File

@ -381,6 +381,11 @@ class psycopg_build_ext(build_ext):
def finalize_options(self): def finalize_options(self):
"""Complete the build system configuration.""" """Complete the build system configuration."""
# An empty option in the setup.cfg causes self.libraries to include
# an empty string in the list of libraries
if self.libraries is not None and not self.libraries.strip():
self.libraries = None
build_ext.finalize_options(self) build_ext.finalize_options(self)
pg_config_helper = PostgresConfig(self) pg_config_helper = PostgresConfig(self)
@ -521,7 +526,7 @@ if parser.has_option('build_ext', 'mx_include_dir'):
mxincludedir = parser.get('build_ext', 'mx_include_dir') mxincludedir = parser.get('build_ext', 'mx_include_dir')
else: else:
mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx") mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
if os.path.exists(mxincludedir): if mxincludedir.strip() and os.path.exists(mxincludedir):
# Build the support for mx: we will check at runtime if it can be imported # Build the support for mx: we will check at runtime if it can be imported
include_dirs.append(mxincludedir) include_dirs.append(mxincludedir)
define_macros.append(('HAVE_MXDATETIME', '1')) define_macros.append(('HAVE_MXDATETIME', '1'))