Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.49.2.3.2.4
diff -u -r1.49.2.3.2.4 configure.in
--- config_office/configure.in	4 Apr 2003 14:21:31 -0000	1.49.2.3.2.4
+++ config_office/configure.in	12 Apr 2003 07:27:47 -0000
@@ -22,13 +22,15 @@
 AC_ARG_ENABLE(symbols,
 [  --enable-symbols        Include debugging symbols in output.  Warning -  
                           a complete build needs 8 Gb of space and takes 
-                          much longer.  (enables -g compiler flag)
+                          much longer.  (enables -g compiler flag for gcc,
+                          -Zi for MSVC)
 
 ],,)
 AC_ARG_ENABLE(debug,
 [  --enable-debug:         Include debugging symbols from --enable-symbols
                           plus extra debugging code.  Extra large build!
-                          (enables -g compiler flag and dmake debug=true)
+                          (enables -g compiler flag for gcc, -Zi for MSVC
+                          and dmake debug=true)
 ],,)
 AC_ARG_WITH(stlport4-home,
 [  --with-stlport4-home    The location that STLport4 is installed in. The STL
@@ -236,9 +238,9 @@
 dnl First setting is whether to include symbols into final build.
 dnl ===================================================================
 if test "$enable_symbols" = "yes"; then
-   ENVCFLAGSCXX="-g"
+   ENABLE_SYMBOLS="yes"
 else
-   ENVCFLAGSCXX=""
+   ENABLE_SYMBOLS="no"
 fi
 
 dnl ===================================================================
@@ -1249,7 +1251,7 @@
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LIBS)
 AC_SUBST(ENABLE_DEBUG)
-AC_SUBST(ENVCFLAGSCXX)
+AC_SUBST(ENABLE_SYMBOLS)
 
 AC_OUTPUT([set_soenv])
 
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.4.2.3.2.3
diff -u -r1.4.2.3.2.3 set_soenv.in
--- config_office/set_soenv.in	2 Apr 2003 13:01:07 -0000	1.4.2.3.2.3
+++ config_office/set_soenv.in	12 Apr 2003 07:27:48 -0000
@@ -1609,7 +1609,16 @@
 if ( $COM ne "MSC" ) {
   ToFile( "LINK",			 $CC,				 "e" );
 }
-ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
+if ( "@ENABLE_SYMBOLS@" eq "yes" ) {
+	if ( "$COM" eq "GCC" ) {
+		ToFile( "ENVCFLAGS", "-g", "e" );
+	} elsif ( "$COM" eq "MSC" ) {
+	    # Set the switch(es) in wnt.mk, they are: "-Zi -Fd$(MISC)\$(PDBTARGET).PDB"
+		ToFile( "ENABLE_SYMBOLS", "yes", "e" );
+	} else {
+		die "Don't know how to enable symbols for $COM" ;
+	}
+}
 ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
 ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
 if ($platform ne "$Winnt")
Index: solenv/inc/wnt.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/wnt.mk,v
retrieving revision 1.45.2.3
diff -u -r1.45.2.3 wnt.mk
--- solenv/inc/wnt.mk	20 Feb 2003 14:04:55 -0000	1.45.2.3
+++ solenv/inc/wnt.mk	12 Apr 2003 07:27:48 -0000
@@ -174,7 +174,10 @@
 .IF "$(seg)" == ""
 .IF "$(demo)" == ""
 CDEFS+= -D_X86_=1 $(OLE2DEF)
-CFLAGS+=-c -nologo -W3 -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE) -Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
+CFLAGS+=-c -nologo -W3 -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE)
+.IF "$(ENABLE_SYMBOLS)" != "no"
+CFLAGS+=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
+.ENDIF # "$(ENABLE_SYMBOLS)" != "no"
 .IF "$(bndchk)" == ""
 CFLAGS+= -Ob1
 .ENDIF