[pywin32-checkins] pywin32 setup.py,1.114,1.115

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

Update of /cvsroot/pywin32/pywin32
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1632

Modified Files:
	setup.py 
Log Message:
Work around more axdebug build woes

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** setup.py	16 Nov 2010 04:43:23 -0000	1.114
--- setup.py	17 Nov 2010 04:13:40 -0000	1.115
***************
*** 517,520 ****
--- 517,528 ----
          return "win32comext/mapi"
  
+ class WinExt_win32com_axdebug(WinExt_win32com):
+     def __init__ (self, name, **kw):
+         # Later SDK versions again ship with activdbg.h, but if we attempt
+         # to use our own copy of that file with that SDK, we fail to link.
+         if os.path.isfile(os.path.join(sdk_dir, "include", "activdbg.h")):
+             kw.setdefault('extra_compile_args', []).append("/DHAVE_SDK_ACTIVDBG")
+         WinExt_win32com.__init__(self, name, **kw)
+ 
  # A hacky extension class for pywintypesXX.dll and pythoncomXX.dll
  class WinExt_system32(WinExt):
***************
*** 1655,1659 ****
      # ActiveDebugging is a mess.  See the comments in the docstring of this
      # module for details on getting it built.
!     WinExt_win32com('axdebug',
              libraries="axscript",
              pch_header="stdafx.h",
--- 1663,1667 ----
      # ActiveDebugging is a mess.  See the comments in the docstring of this
      # module for details on getting it built.
!     WinExt_win32com_axdebug('axdebug',
              libraries="axscript",
              pch_header="stdafx.h",