Updating win32 support for gmake build:

* Add LIB_PREFIX to build * Read MOZ_TOOLS at configure time to set LIBIDL_* on win32 * Move MOZ_DEBUG_LDFLAGS settings into config.mk * Fix problem with ldap being configured for standalone modules when not specified * Fix PROGRAMS & SIMPLE_PROGRAMS rules for win32 Bug #58981 r=bryner
2024-11-25 05:41:12 +00:00 · 2001-12-09 07:08:58 +00:00 · 2001-12-09 07:08:58 +00:00 · 7f4b4cba9a
commit 7f4b4cba9a
parent 33ab7a9398
4 changed files with 145 additions and 64 deletions
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -53,6 +53,7 @@ MOZ_PROFILE_MODULES = @MOZ_PROFILE_MODULES@
 MOZ_DEBUG_ENABLE_DEFS		= @MOZ_DEBUG_ENABLE_DEFS@
 MOZ_DEBUG_DISABLE_DEFS	= @MOZ_DEBUG_DISABLE_DEFS@
 MOZ_DEBUG_FLAGS	= @MOZ_DEBUG_FLAGS@
+MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
 MOZ_DBGRINFO_MODULES	= @MOZ_DBGRINFO_MODULES@
 MOZ_EXTENSIONS  = @MOZ_EXTENSIONS@
 MOZ_JSDEBUGGER  = @MOZ_JSDEBUGGER@
@ -161,6 +162,7 @@ IMPLIB		= @IMPLIB@
 FILTER		= @FILTER@
 BIN_FLAGS	= @BIN_FLAGS@

+LIB_PREFIX	= @LIB_PREFIX@
 OBJ_SUFFIX	= @OBJ_SUFFIX@
 LIB_SUFFIX	= @LIB_SUFFIX@
 DLL_SUFFIX	= @DLL_SUFFIX@
--- a/config/config.mk
+++ b/config/config.mk
@ -186,7 +186,8 @@ MOZ_REGISTRY_LIBS          = $(DIST)/lib/libmozreg_s.$(LIB_SUFFIX)
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/libwidgetsupport_s.$(LIB_SUFFIX)

 # determine debug-related options
-DEBUG_FLAGS :=
+_DEBUG_CFLAGS :=
+_DEBUG_LDFLAGS :=

 ifndef MOZ_DEBUG
  # global debugging is disabled 
@ -203,9 +204,9 @@ else
 endif

 ifdef MOZ_DEBUG
-  DEBUG_FLAGS += $(MOZ_DEBUG_ENABLE_DEFS)
+  _DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS)
 else
-  DEBUG_FLAGS += $(MOZ_DEBUG_DISABLE_DEFS)
+  _DEBUG_CFLAGS += $(MOZ_DEBUG_DISABLE_DEFS)
 endif

 # determine if -g should be passed to the compiler, based on
@ -236,7 +237,8 @@ first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES)))
 ifeq ($(first_match), $(MODULE))
  # the user specified explicitly that 
  # this module should be compiled with -g
-  DEBUG_FLAGS += $(MOZ_DEBUG_FLAGS)
+  _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
+  _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
 else
  ifeq ($(first_match), ^$(MODULE))
    # the user specified explicitly that this module 
@ -245,7 +247,8 @@ else
    ifeq ($(first_match), ALL_MODULES)
      # the user didn't mention this module explicitly, 
      # but wanted all modules to be compiled with -g
-      DEBUG_FLAGS += $(MOZ_DEBUG_FLAGS)
+      _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS)
+      _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)      
    else
      ifeq ($(first_match), ^ALL_MODULES)
        # the user didn't mention this module explicitly, 
@ -258,8 +261,9 @@ endif

 # append debug flags 
 # (these might have been above when processing MOZ_DBGRINFO_MODULES)
-OS_CFLAGS += $(DEBUG_FLAGS)
-OS_CXXFLAGS += $(DEBUG_FLAGS)
+OS_CFLAGS += $(_DEBUG_CFLAGS)
+OS_CXXFLAGS += $(_DEBUG_CFLAGS)
+OS_LDFLAGS += $(_DEBUG_LDFLAGS)

 #
 # -ffunction-sections is needed to reorder functions using a GNU ld
@ -465,8 +469,40 @@ endif # MOZ_OPTIMIZE == 1
 LDFLAGS		+= $(MOZ_OPTIMIZE_LDFLAGS)
 endif # MOZ_OPTIMIZE

-COMPILE_CFLAGS	= $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(OS_COMPILE_CFLAGS)
-COMPILE_CXXFLAGS = $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS)  $(CXXFLAGS) $(OS_COMPILE_CXXFLAGS)
+ifeq ($(OS_ARCH),WINNT)
+#// Currently, unless USE_STATIC_LIBS is defined, the multithreaded
+#// DLL version of the RTL is used...
+#//
+#//------------------------------------------------------------------------
+ifdef USE_STATIC_LIBS
+RTL_FLAGS=-MT          # Statically linked multithreaded RTL
+ifneq (,$(MOZ_DEBUG)$(MOZ_TRACE_MALLOC))
+RTL_FLAGS=-MTd         # Statically linked multithreaded MSVC4.0 debug RTL
+endif # MOZ_DEBUG || MOZ_TRACE_MALLOC
+
+else # !USE_STATIC_LIBS
+
+ifdef USE_NON_MT_LIBS
+RTL_FLAGS=-ML          # Statically linked non-multithreaded LIBC RTL
+ifneq (,$(MOZ_DEBUG)$(MOZ_TRACE_MALLOC))
+RTL_FLAGS=-MLd         # Statically linked non-multithreaded LIBC debug RTL
+endif # MOZ_DEBUG || MOZ_TRACE_MALLOC
+
+else # ! USE_NON_MT_LIBS
+
+RTL_FLAGS=-MD          # Dynamically linked, multithreaded RTL
+ifneq (,$(MOZ_DEBUG)$(MOZ_TRACE_MALLOC))
+ifndef MOZ_NO_DEBUG_RTL
+RTL_FLAGS=-MDd         # Dynamically linked, multithreaded MSVC4.0 debug RTL
+endif 
+endif # MOZ_DEBUG || MOZ_TRACE_MALLOC
+endif # USE_NON_MT_LIBS
+endif # USE_STATIC_LIBS
+endif # WINNT
+
+
+COMPILE_CFLAGS	= $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS)
+COMPILE_CXXFLAGS = $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS)  $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)

 #
 # Some platforms (Solaris) might require builds using either
--- a/config/rules.mk
+++ b/config/rules.mk
@ -135,21 +135,13 @@ ifdef SHORT_LIBNAME
 LIBRARY_NAME		:= $(SHORT_LIBNAME)
 endif
 endif
-ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
-LIBRARY			:= $(LIBRARY_NAME).$(LIB_SUFFIX)
-else
-LIBRARY			:= lib$(LIBRARY_NAME).$(LIB_SUFFIX)
-endif # WINNT && !GNU_CC
+LIBRARY			:= $(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
 endif
 endif

 ifndef HOST_LIBRARY
 ifdef HOST_LIBRARY_NAME
-ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
-HOST_LIBRARY		:= lib$(HOST_LIBRARY_NAME).$(LIB_SUFFIX)
-else
-HOST_LIBRARY		:= lib$(HOST_LIBRARY_NAME).$(LIB_SUFFIX)
-endif # WINNT && !GNU_CC
+HOST_LIBRARY		:= $(LIB_PREFIX)$(HOST_LIBRARY_NAME).$(LIB_SUFFIX)
 endif
 endif

@ -157,28 +149,27 @@ ifdef LIBRARY
 ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB))
 ifdef MKSHLIB

-ifeq ($(OS_ARCH),OS2)
-DEF_OBJS		= $(OBJS)
-ifneq ($(EXPORT_OBJS),1)
-DEF_OBJS		+= $(SHARED_LIBRARY_LIBS)
-endif
-SHARED_LIBRARY		:= $(LIBRARY_NAME)$(DLL_SUFFIX)
-DEF_FILE		:= $(SHARED_LIBRARY:.dll=.def)
-IMPORT_LIBRARY		:= $(SHARED_LIBRARY:.dll=.lib)
-else  # OS2
-
-
-ifeq (,$(filter-out BeOS, $(OS_ARCH)))
 # Unix only
+ifeq (,$(filter-out BeOS OS2 WINNT, $(OS_ARCH)))
 ifdef LIB_IS_C_ONLY
 MKSHLIB			= $(MKCSHLIB)
 endif
 endif

 SHARED_LIBRARY		:= $(LIBRARY:.$(LIB_SUFFIX)=$(DLL_SUFFIX))
-IMPORT_LIBRARY		:= 

-endif # OS2
+ifeq ($(OS_ARCH),OS2)
+DEF_OBJS		= $(OBJS)
+ifneq ($(EXPORT_OBJS),1)
+DEF_OBJS		+= $(SHARED_LIBRARY_LIBS)
+endif
+DEF_FILE		:= $(SHARED_LIBRARY:.dll=.def)
+endif
+
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+IMPORT_LIBRARY		:= $(SHARED_LIBRARY:.dll=.lib)
+endif
+
 endif # MKSHLIB
 endif # BUILD_SHARED_LIBS || FORCE_SHARED_LIB
 endif # LIBRARY
@ -201,11 +192,40 @@ IMPORT_LIBRARY		:= $(NULL)
 endif
 endif

+ifeq ($(OS_ARCH),WINNT)
+
 ifdef LIBRARY_NAME
 PDBFILE=$(LIBRARY_NAME).pdb
-else
-PDBFILE='$*.pdb'
+ifdef MOZ_DEBUG
+MAPFILE=$(LIBRARY_NAME).map
+CODFILE=$(LIBRARY_NAME).cod
 endif
+else
+PDBFILE=$*.pdb
+ifdef MOZ_DEBUG
+MAPFILE=$*.map
+CODFILE=$*.cod
+endif
+endif # LIBRARY_NAME
+
+ifdef DEFFILE
+CFLAGS += /DEF:$(DEFFILE)
+CXXFLAGS += /DEF:$(DEFFILE)
+DSO_LDOPTS += /DEF:$(DEFFILE)
+endif
+
+ifdef MAPFILE
+DSO_LDOPTS += /MAP:$(MAPFILE) /MAPINFO:LINES
+#CFLAGS += -Fm$(MAPFILE)
+#CXXFLAGS += -Fm$(MAPFILE)
+endif
+
+#ifdef CODFILE
+#CFLAGS += -Fa$(CODFILE) -FAsc
+#CFLAGS += -Fa$(CODFILE) -FAsc
+#endif
+
+endif # WINNT

 ifndef TARGETS
 TARGETS			= $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS)
@ -259,6 +279,7 @@ ALL_TRASH = \
 	$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
 	$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\
 	$(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) \
+	$(wildcard *.pdb) $(wildcard *.exp) $(wildcard *.map) \
 	$(wildcard gts_tmp_*) $(LIBRARY:%.a=.%.timestamp)
 ALL_TRASH_DIRS = \
 	$(GARBAGE_DIRS)
@ -654,7 +675,7 @@ ifdef BEOS_ADDON_WORKAROUND
 	( cd $(DIST)/bin/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
 endif
 else # ! IS_COMPONENT
-ifeq ($(OS_ARCH),OS2)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
 else
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
@ -721,11 +742,15 @@ $(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS) $(EXE_DEF_FILE) Makefile Makefile.in
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LD) -OUT:$@ $(LDFLAGS) $(PROGOBJS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(EXE_DEF_FILE) /ST:0x100000
 else
+ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+	$(LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(PROGOBJS) $(LDFLAGS) $(LIBS) $(OS_LIBS)
+else
 ifeq ($(CPP_PROG_LINK),1)
 	$(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
 else # ! CPP_PROG_LINK
 	$(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
+endif # WINNT && !GNU_CC
 endif # OS2
 ifdef ENABLE_STRIP
 	$(STRIP) $@
@ -758,19 +783,19 @@ $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
 # creates Foo.o Bar.o, links with LIBS to create Foo, Bar.
 #
 $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(EXTRA_DEPS) Makefile Makefile.in
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+	$(LD) /Out:$@ $< $(LDFLAGS) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
+else
+ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
+	$(LD) /nologo /out:$@ /pdb:$(PDBFILE) $< $(LIBS) $(OS_LIBS)
+else
 ifeq ($(CPP_PROG_LINK),1)
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(LD) /Out:$@ $< $(LDFLAGS) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
-else
 	$(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
-endif
 else
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-	$(LD) /Out:$@ $< $(LDFLAGS) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
-else
-	$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
-endif
-endif
+	$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
+endif # CPP_PROG_LINK
+endif # WINNT && !GNU_CC
+endif # OS/2 VACPP
 ifdef ENABLE_STRIP
 	$(STRIP) $@
 endif
@ -950,7 +975,7 @@ $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.c Makefile.in

 $(OBJ_PREFIX)%.ho: %.c Makefile.in
 	$(REPORT_BUILD)
-	$(ELOG) $(HOST_CC)$(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $<
+	$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $<

 moc_%.cpp: %.h Makefile.in
 	$(MOC) $< $(OUTOPTION)$@ 
@ -969,7 +994,7 @@ endif

 %: %.cpp Makefile.in
 	@$(MAKE_DEPS_AUTO)
-	$(CCC) -o $@ $(CXXFLAGS) $< $(LDFLAGS)
+	$(CCC) $(OUTOPTION)$@ $(CXXFLAGS) $< $(LDFLAGS)

 #
 # Please keep the next two rules in sync.
--- a/configure.in
+++ b/configure.in
@ -152,9 +152,6 @@ case "$target" in
        fi
        rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
    fi
-    if test `echo $MOZ_BUILD_ROOT | grep -c ^/cygdrive/` != 0; then
-        MOZ_BUILD_ROOT=`echo $MOZ_BUILD_ROOT | sed -e 's|^/cygdrive/||' -e 's|/|:/|'`
-    fi
    ;;
 *-msvc*|*-mksnt*)
    _WIN32_MSVC=1
@ -427,6 +424,7 @@ AR_EXTRACT='$(AR) x'
 AR_DELETE='$(AR) d'
 AS='$(CC)'
 AS_DASH_C_FLAG='-c'
+LIB_PREFIX=lib
 DLL_SUFFIX=.so
 OBJ_SUFFIX=o
 LIB_SUFFIX=a
@ -912,18 +910,21 @@ case "$target" in
        ZIP=zip
        UNZIP=unzip
        GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb'
+        LIB_PREFIX=
    	OBJ_SUFFIX=obj
    	LIB_SUFFIX=lib
    	DLL_SUFFIX=.dll
-        MKSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ /PDB:$(PDBFILE)'
+        MKSHLIB='$(LD) /NOLOGO /DLL /OUT:$@ /PDB:$(PDBFILE) $(DSO_LDOPTS)'
        MKSHLIB_FORCE_ALL=
        MKSHLIB_UNFORCE_ALL=
-        DSO_LDOPTS=
+        DSO_LDOPTS=/SUBSYSTEM:WINDOWS
        DSO_CFLAGS=
        DSO_PIC_CFLAGS=
-        CFLAGS="$CFLAGS -W3 -nologo -Gy"
-        CXXFLAGS="$CXXFLAGS -W3 -nologo -Gy"
+        CFLAGS="$CFLAGS -W3 -nologo -Gy -Fd\$(PDBFILE)"
+        CXXFLAGS="$CXXFLAGS -W3 -nologo -Gy -Fd\$(PDBFILE)"
+        LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib"
        MOZ_DEBUG_FLAGS='-Zi'
+        MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV'
    	MOZ_OPTIMIZE_FLAGS='-O1'
        MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.lib'
        MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib'
@ -935,12 +936,14 @@ case "$target" in
        MOZ_COMPONENT_XPCOM_LIBS='$(XPCOM_LIBS)'
    fi
    AC_DEFINE(_WINDOWS)
+    AC_DEFINE(_WIN32)
    AC_DEFINE(WIN32)
    AC_DEFINE(XP_PC)
    AC_DEFINE(XP_WIN)
    AC_DEFINE(XP_WIN32)
    AC_DEFINE(HW_THREADS)
    AC_DEFINE_UNQUOTED(WINVER,0x400)
+    AC_DEFINE(MSVC4)
    AC_DEFINE(STDC_HEADERS)
    TARGET_MD_ARCH=win32
    OS_TARGET=WINNT
@ -951,6 +954,20 @@ case "$target" in
    TARGET_NSPR_MDCPUCFG='\"md/_win95.cfg\"'
    no_x=yes

+    dnl Remove cygwinism from MOZ_BUILD_ROOT
+    if test `echo $MOZ_BUILD_ROOT | grep -c ^/cygdrive/` != 0; then
+        MOZ_BUILD_ROOT=`echo $MOZ_BUILD_ROOT | sed -e 's|^/cygdrive/||' -e 's|/|:/|'`
+    fi
+
+    if test "$MOZ_TOOLS"; then
+        _MOZTOOLS=`cd $MOZ_TOOLS ; pwd`
+        _MOZTOOLS=`echo $_MOZTOOLS | sed -e 's|^/cygdrive/||' -e 's|/|:/|'`
+        LIBIDL_CFLAGS="-I${_MOZTOOLS}/include"
+        LIBIDL_LIBS="${_MOZTOOLS}/lib/libidl-0.6.lib ${_MOZTOOLS}/lib/glib-1.2.lib"
+   else
+        AC_MSG_ERROR([MOZ_TOOLS is not set])
+    fi
+
    case "$target" in
    i?86-*)
    	AC_DEFINE(_X86_)
@ -1112,6 +1129,7 @@ case "$target" in
        DSO_LDOPTS=''
        IMPLIB='implib /NOL /NOI'
        FILTER='cppfilt -q -B -P'
+        LIB_PREFIX=
        AC_DEFINE(NO_ANSI_KEYWORDS)
        AC_DEFINE(OS2,4)
        AC_DEFINE(_X86_)
@ -3219,24 +3237,22 @@ MOZ_ARG_DISABLE_BOOL(debug,
 [  --disable-debug         Disable building with debug info],
    MOZ_DEBUG=)

-MOZ_DEBUG_ENABLE_DEFS="-DDEBUG"
+MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -D_DEBUG"
 case "${target_os}" in
    beos*)
-      MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DDEBUG_${USER}"
+        MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DDEBUG_${USER}"
+        ;;
+    msvc*|mksnt*|cygwin*|mingw*)
+        MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DDEBUG_${USERNAME}"
        ;;
    *) 
-      MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DDEBUG_`$WHOAMI`"
+        MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DDEBUG_`$WHOAMI`"
        ;;
  esac
 MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DTRACING"

 MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED"

-if test "$MOZ_DEBUG"
-then
-  LDFLAGS="$LDFLAGS $MOZ_DEBUG_LDFLAGS"
-fi
-
 dnl ========================================================
 dnl = Enable code optimization. OFF by default.
 dnl ========================================================
@ -3961,7 +3977,7 @@ fi
 dnl Disable ldap if LDAP is not building all of Mozilla
 dnl and ldap isn't in the standalone list
 if test "$BUILD_MODULES" != "all" &&
-    test `echo "$BUILD_MODULES" | grep -c ldap` -ne 0 &&
+    test `echo "$BUILD_MODULES" | grep -c ldap` = 0 &&
    test "$enable_ldap" != "yes"; then
    MOZ_LDAP_XPCOM=
 fi
@ -4111,6 +4127,7 @@ AC_SUBST(MOZ_PROFILE_MODULES)
 AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_FLAGS)
+AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(MOZ_DBGRINFO_MODULES)
 AC_SUBST(MOZ_EXTENSIONS)
 AC_SUBST(MOZ_JSDEBUGGER)
@ -4280,6 +4297,7 @@ AC_SUBST(MKSHLIB_UNFORCE_ALL)
 AC_SUBST(DSO_CFLAGS)
 AC_SUBST(DSO_PIC_CFLAGS)
 AC_SUBST(DSO_LDOPTS)
+AC_SUBST(LIB_PREFIX)
 AC_SUBST(DLL_SUFFIX)
 AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, "$DLL_SUFFIX")
 AC_SUBST(LIB_SUFFIX)