[Commits] (vajda) fixed debug vs release compile flag bug

[commits at osafoundation.org]

Commit by: vajda
Modified files:
osaf/chandler/persistence/libxml2/python/winSetup.py.in 1.6 1.7
osaf/chandler/persistence/libxml2/win32/Makefile.msvc 1.4 1.5

Log message:
fixed debug vs release compile flag bug


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/persistence/libxml2/python/winSetup.py.in.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/osaf/chandler/persistence/libxml2/win32/Makefile.msvc.diff?r1=text&tr1=1.4&r2=text&tr2=1.5

Index: osaf/chandler/persistence/libxml2/python/winSetup.py.in
diff -u osaf/chandler/persistence/libxml2/python/winSetup.py.in:1.6 osaf/chandler/persistence/libxml2/python/winSetup.py.in:1.7
--- osaf/chandler/persistence/libxml2/python/winSetup.py.in:1.6	Wed Jan 28 11:30:44 2004
+++ osaf/chandler/persistence/libxml2/python/winSetup.py.in	Thu Jan 29 13:52:41 2004
@@ -10,12 +10,6 @@
 # on Windows, it is set by configure.js.
 ROOT = os.path.join('..', 'win32', '@prefix@')
 
-# In order to not link against both debug and non-debug versions of msvcrt
-EXTRALINKARGS = []
-debug = "--debug" in sys.argv or "-g" in sys.argv
-if debug and os.name == "nt":
-    EXTRALINKARGS.append("/NODEFAULTLIB:MSVCRT")
-
 # Thread-enabled libxml2
 with_threads = @WITH_THREADS@
 
@@ -79,7 +73,6 @@
                   include_dirs=includes,
                   library_dirs=libdirs, 
                   libraries=libs, 
-                  extra_link_args=EXTRALINKARGS,
                   define_macros=macros)] 
 
 if missing("MANIFEST"):

Index: osaf/chandler/persistence/libxml2/win32/Makefile.msvc
diff -u osaf/chandler/persistence/libxml2/win32/Makefile.msvc:1.4 osaf/chandler/persistence/libxml2/win32/Makefile.msvc:1.5
--- osaf/chandler/persistence/libxml2/win32/Makefile.msvc:1.4	Wed Jan 28 10:21:22 2004
+++ osaf/chandler/persistence/libxml2/win32/Makefile.msvc	Thu Jan 29 13:52:41 2004
@@ -41,6 +41,10 @@
 CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
 !endif
 
+!if "$(DEBUG)" == "1"
+CRUNTIME = $(CRUNTIME)d
+!endif
+
 # The compiler and its options.
 CC = cl.exe
 CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W1 $(CRUNTIME)