[Python-checkins] python/dist/src setup.py,1.173,1.174

Tue Oct 21 11:41:18 EDT 2003

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21210
Modified Files:
	setup.py 
Log Message:
Provide a bit more information to the compiler when building Expat.
This avoids having to modify the Expat sources in any way starting
with Expat 1.95.7.
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** setup.py	22 Sep 2003 01:16:48 -0000	1.173
--- setup.py	21 Oct 2003 15:41:15 -0000	1.174
***************
*** 738,756 ****
 xmlbo = "4321"
 expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
! exts.append(Extension('pyexpat',
! sources = [
! 'pyexpat.c',
! 'expat/xmlparse.c',
! 'expat/xmlrole.c',
! 'expat/xmltok.c',
! ],
! define_macros = [
 ('XML_NS', '1'),
 ('XML_DTD', '1'),
 ('BYTEORDER', xmlbo),
 ('XML_CONTEXT_BYTES','1024'),
! ],
! include_dirs = [expatinc]
! ))
 
 # Dynamic loading module
--- 738,761 ----
 xmlbo = "4321"
 expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
! define_macros = [
 ('XML_NS', '1'),
 ('XML_DTD', '1'),
 ('BYTEORDER', xmlbo),
 ('XML_CONTEXT_BYTES','1024'),
! ]
! config_h = sysconfig.get_config_h_filename()
! config_h_vars = sysconfig.parse_config_h(open(config_h))
! for feature_macro in ['HAVE_MEMMOVE', 'HAVE_BCOPY']:
! if config_h_vars.has_key(feature_macro):
! define_macros.append((feature_macro, '1'))
! exts.append(Extension('pyexpat',
! define_macros = define_macros,
! include_dirs = [expatinc],
! sources = ['pyexpat.c',
! 'expat/xmlparse.c',
! 'expat/xmlrole.c',
! 'expat/xmltok.c',
! ],
! ))
 
 # Dynamic loading module