[Python-checkins] python/dist/src setup.py,1.171.6.1,1.171.6.2

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6819

Modified Files:
      Tag: release23-maint
	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.171.6.1
retrieving revision 1.171.6.2
diff -C2 -d -r1.171.6.1 -r1.171.6.2
*** setup.py	22 Sep 2003 01:19:45 -0000	1.171.6.1
--- setup.py	21 Oct 2003 20:01:21 -0000	1.171.6.2
***************
*** 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