Bugzilla bug 249782: make NSPR compile with Microsoft Visual Studio 2005.

The -DEBUGTYPE flag is no longer supported. Since -DEBUGTYPE:CV is the
default, we simply delete it.  We added support for VC 5.0 (MSC_VER=1100)
back.  The patch is contributed by Stephen Walker <sdwalker@myrealbox.com>.
r=wtc.
Modified Files:
 Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
	configure configure.in config/rules.mk
	lib/msgc/tests/Makefile.in
	lib/prstreams/tests/testprstrm/Makefile.in
	lib/tests/Makefile.in lib/tests/windows/makefile
	tools/Makefile.in

8 files changed, 13 insertions, 13 deletions

diff --git a/config/rules.mk b/config/rules.mk
index bba50ee7..e6f6b6b5 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -140,7 +140,7 @@ ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 TARGETS		= $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
 ifndef BUILD_OPT
 ifdef MSC_VER
-ifneq ($(MSC_VER),1200)
+ifneq (,$(filter-out 1100 1200,$(MSC_VER)))
 TARGETS		+= $(SHARED_LIB_PDB)
 endif
 endif
diff --git a/configure b/configure
index 35e33a14..6107c556 100755
--- a/configure
+++ b/configure
@@ -3824,8 +3824,8 @@ EOF
         fi
 
         if test -n "$MOZ_DEBUG"; then
-            DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV"
-            LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV"
+            DLLFLAGS="$DLLFLAGS -DEBUG"
+            LDFLAGS="$LDFLAGS -DEBUG"
         fi
         
         if test "$OS_TARGET" = "WINNT"; then
@@ -3877,7 +3877,7 @@ EOF
     fi
 
     OS_DLLFLAGS="-nologo -DLL -SUBSYSTEM:WINDOWS"
-    if test "$MSC_VER" = "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then
+    if test "$MSC_VER" -le "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then
         OS_DLLFLAGS="$OS_DLLFLAGS -PDB:NONE"
     fi
 
diff --git a/configure.in b/configure.in
index 832c2412..5bcb8e0e 100644
--- a/configure.in
+++ b/configure.in
@@ -1301,8 +1301,8 @@ case "$target" in
         fi
 
         if test -n "$MOZ_DEBUG"; then
-            DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV"
-            LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV"
+            DLLFLAGS="$DLLFLAGS -DEBUG"
+            LDFLAGS="$LDFLAGS -DEBUG"
         fi
         
         if test "$OS_TARGET" = "WINNT"; then
@@ -1342,7 +1342,7 @@ case "$target" in
     fi
 
     OS_DLLFLAGS="-nologo -DLL -SUBSYSTEM:WINDOWS"
-    if test "$MSC_VER" = "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then
+    if test "$MSC_VER" -le "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then
         OS_DLLFLAGS="$OS_DLLFLAGS -PDB:NONE"
     fi
 
diff --git a/lib/msgc/tests/Makefile.in b/lib/msgc/tests/Makefile.in
index 23518e15..609bdf6b 100644
--- a/lib/msgc/tests/Makefile.in
+++ b/lib/msgc/tests/Makefile.in
@@ -84,7 +84,7 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPLC = $(dist_libdir)/plc$(NSPR_VERSION).lib
   LIBGC= $(dist_libdir)/msgc$(GC_VERSION).lib
 else
-  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
   LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
   LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
   LIBGC= $(dist_libdir)/libmsgc$(GC_VERSION).$(LIB_SUFFIX)
diff --git a/lib/prstreams/tests/testprstrm/Makefile.in b/lib/prstreams/tests/testprstrm/Makefile.in
index 1b682ff8..e1405fd0 100644
--- a/lib/prstreams/tests/testprstrm/Makefile.in
+++ b/lib/prstreams/tests/testprstrm/Makefile.in
@@ -79,7 +79,7 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
   LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).lib
 else
-  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
   ifeq ($(OS_TARGET), WIN95)
     LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
     LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 8c3dc9a8..18917ad1 100644
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -88,7 +88,7 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib
   LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).lib
 else
-  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
   ifeq ($(OS_TARGET), WIN95)
   LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
   LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
diff --git a/lib/tests/windows/makefile b/lib/tests/windows/makefile
index 1cf2c079..c6106a6a 100644
--- a/lib/tests/windows/makefile
+++ b/lib/tests/windows/makefile
@@ -49,7 +49,7 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
   LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
 else
-  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
   ifeq ($(OS_TARGET), WIN95)
   LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
   LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
@@ -64,7 +64,7 @@ endif
 
 TARGETS = $(OBJDIR)/winevent.exe
 OS_CFLAGS = $(OS_EXE_CFLAGS)
-LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
 LDFLAGS += -DEBUG
 LIBPR += $(LIBPLDS)
 LIBPR += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
diff --git a/tools/Makefile.in b/tools/Makefile.in
index eb18de01..c01b0a64 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -83,7 +83,7 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib
   LIBPLC= $(dist_libdir)/plc$(NSPR_VERSION).lib
 else
-LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
 LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
 LIBPLC= $(dist_libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
 endif