Landing modular netlib on Window.

config/config.mak

@@ -147,6 +147,10 @@ CFLAGS = $(CFLAGS) -DDEVELOPER_DEBUG
 CFLAGS=$(CFLAGS) -DSTANDALONE_IMAGE_LIB
 !endif
 
+!ifdef MODULAR_NETLIB
+CFLAGS=$(CFLAGS) -DMODULAR_NETLIB
+!endif
+
 # always need these:
 CFLAGS = $(CFLAGS) -DNETSCAPE
 

network/makefile.win

@@ -31,11 +31,8 @@ DIRS= \
 	cache \
 	protocol \
 	cnvts \
-!ifdef MODULAR_NETLIB
-	module \
-!else
 	client \
-!endif
+	module \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak> 

nglayout.mak

@@ -77,7 +77,7 @@ DIST_DIRS =			\
   modules\libimg		\
   base                          \
   lib\xp			\
-  lib\libnet
+  network
 
 # The list of directories to build the nglayout layout engine and
 # related libraries.
@@ -160,8 +160,8 @@ pull_imglib:
 pull_netlib:
 	@cd $(MOZ_SRC)\.
 	$(CVSCO_NETLIB) $(MOZ_TOP)/lib/xp
-	$(CVSCO_NETLIB) $(MOZ_TOP)/lib/libnet
-	$(CVSCO_NETLIB) $(MOZ_TOP)/include
+	$(CVSCO_LIZARD) $(MOZ_TOP)/network
+	$(CVSCO_LIZARD) -A $(MOZ_TOP)/include
 
 pull_nglayout:
 	@cd $(MOZ_SRC)\.