[pywin32-checkins] pywin32 setup.py,1.81.2.14,1.81.2.15

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24579

Modified Files:
      Tag: py3k
	setup.py 
Log Message:
merge recent changes from the trunk

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.81.2.14
retrieving revision 1.81.2.15
diff -C2 -d -r1.81.2.14 -r1.81.2.15
*** setup.py	14 Jan 2009 12:42:02 -0000	1.81.2.14
--- setup.py	25 Jan 2009 04:52:19 -0000	1.81.2.15
***************
*** 403,407 ****
              if self.implib_name:
                  implib = os.path.join(build_ext.build_temp, self.implib_name)
!                 self.extra_link_args.append("/IMPLIB:%s" % implib)
              # Try and find the MFC source code, so we can reach inside for
              # some of the ActiveX support we need.  We need to do this late, so
--- 403,411 ----
              if self.implib_name:
                  implib = os.path.join(build_ext.build_temp, self.implib_name)
!                 if build_ext.debug:
!                     suffix = "_d"
!                 else:
!                     suffix = ""
!                 self.extra_link_args.append("/IMPLIB:%s%s.lib" % (implib, suffix))
              # Try and find the MFC source code, so we can reach inside for
              # some of the ActiveX support we need.  We need to do this late, so
***************
*** 1605,1609 ****
              dsp_file=r"com\Active Scripting.dsp",
              extra_compile_args = ['-DPY_BUILD_AXSCRIPT'],
!             implib_name="axscript.lib",
              pch_header = "stdafx.h"
      ),
--- 1609,1613 ----
              dsp_file=r"com\Active Scripting.dsp",
              extra_compile_args = ['-DPY_BUILD_AXSCRIPT'],
!             implib_name="axscript",
              pch_header = "stdafx.h"
      ),
***************
*** 1750,1754 ****
                          %(propsys)s/propsys.cpp
                          """ % dirs).split(),
!                     implib_name="pypropsys.lib",
                      ),
  
--- 1754,1758 ----
                          %(propsys)s/propsys.cpp
                          """ % dirs).split(),
!                     implib_name="pypropsys",
                      ),