Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix for bug #129173, reported by Skip Montanaro: 

Check for the two possible headers for Expat, expat.h and xmlparse.h,
   and only compile the pyexpat module if one of them is found.
This commit is contained in:
Andrew M. Kuchling 2001-01-17 20:51:18 +00:00
parent 33b4d50180
commit a99202a017
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup.py
View File

@ -68,6 +68,7 @@ class PyBuildExt(build_ext):
# a fixed list # a fixed list
lib_dirs = self.compiler.library_dirs[:] lib_dirs = self.compiler.library_dirs[:]
lib_dirs += ['/lib', '/usr/lib', '/usr/local/lib'] lib_dirs += ['/lib', '/usr/lib', '/usr/local/lib']
inc_dirs = ['/usr/include', '/usr/local/include'] + self.include_dirs
exts = [] exts = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules # XXX Omitted modules: gl, pure, dl, SGI-specific modules
@ -232,8 +233,7 @@ class PyBuildExt(build_ext):
# Setup.config before enabling it here. # Setup.config before enabling it here.
if (self.compiler.find_library_file(lib_dirs, 'db') and if (self.compiler.find_library_file(lib_dirs, 'db') and
find_file(['/usr/include', '/usr/local/include'] + self.include_dirs, find_file(inc_dirs, 'db_185.h') ):
'db_185.h') ):
exts.append( Extension('bsddb', ['bsddbmodule.c'], exts.append( Extension('bsddb', ['bsddbmodule.c'],
libraries = ['db'] ) ) libraries = ['db'] ) )
@ -340,8 +340,15 @@ class PyBuildExt(build_ext):
# ar cr libexpat.a xmltok/*.o xmlparse/*.o # ar cr libexpat.a xmltok/*.o xmlparse/*.o
# #
if (self.compiler.find_library_file(lib_dirs, 'expat')): if (self.compiler.find_library_file(lib_dirs, 'expat')):
exts.append( Extension('pyexpat', ['pyexpat.c'], defs = None
libraries = ['expat']) ) if find_file(inc_dirs, 'expat.h'):
defs = [('HAVE_EXPAT_H', 1)]
elif find_file(inc_dirs, 'xmlparse.h'):
defs = []
if defs is not None:
exts.append( Extension('pyexpat', ['pyexpat.c'],
define_macros = defs,
libraries = ['expat']) )
# Platform-specific libraries # Platform-specific libraries
plat = sys.platform plat = sys.platform