Index: connectivity/source/drivers/mozab/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/makefile.mk,v
retrieving revision 1.10
diff -u -p -u -r1.10 makefile.mk
--- connectivity/source/drivers/mozab/makefile.mk	28 Apr 2003 16:58:58 -0000	1.10
+++ connectivity/source/drivers/mozab/makefile.mk	14 Aug 2003 12:00:01 -0000
@@ -66,7 +66,7 @@ PRJNAME=connectivity
 TARGET=$(MOZAB_TARGET)
 TARGET2=$(MOZAB_TARGET)drv
 
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO"
 all: 
 	@echo "		Not building the mozabsrc stuff in OpenOffice.org build"
 	@echo "		dependency to Mozilla developer snapshots not feasable at the moment"
Index: connectivity/source/drivers/mozab/mozillasrc/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk,v
retrieving revision 1.11
diff -u -p -u -r1.11 makefile.mk
--- connectivity/source/drivers/mozab/mozillasrc/makefile.mk	15 Apr 2003 17:39:14 -0000	1.11
+++ connectivity/source/drivers/mozab/mozillasrc/makefile.mk	14 Aug 2003 12:00:19 -0000
@@ -85,7 +85,7 @@ ENVCFLAGS+=/FR$(SLO)$/
 
 .INCLUDE : settings.mk
 
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO"
 
 dummy:
 	@echo "		Not building the mozillasrc stuff in OpenOffice.org build"
Index: scp/source/office/files.scp
===================================================================
RCS file: /cvs/installation/scp/source/office/files.scp,v
retrieving revision 1.367
diff -u -p -u -r1.367 files.scp
--- scp/source/office/files.scp	17 Jul 2003 08:54:46 -0000	1.367
+++ scp/source/office/files.scp	14 Aug 2003 12:09:00 -0000
@@ -388,7 +388,7 @@ File GID_FILE_LIB_DBODBCBASE
 	Styles			= (PACKED);
 End
 
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(WITHOUT_MOZILLA)
 File GID_FILE_LIB_MOZABDRV
 	TXT_FILE_BODY;
 	#ifdef UNX
@@ -750,7 +727,7 @@ File GID_FILE_LIB_MYSQL_2
         #endif
 End
 
-#ifndef MACOSX
+#if !defined(MACOSX) && !defined(WITHOUT_MOZILLA)
 File GID_FILE_LIB_MOZAB_2
         TXT_FILE_BODY;
         Styles          = (PACKED,UNO_COMPONENT);
@@ -3209,6 +3248,9 @@ End
 
 #endif
                                   // of #ifdef SOLAR_JAVA
+
+#ifndef WITHOUT_MOZILLA 
+
 #ifndef MACOSX
 File GID_FILE_MOZILLA_RUNTIME
         TXT_FILE_BODY;
@@ -3216,6 +3258,8 @@ File GID_FILE_MOZILLA_RUNTIME
         Dir    = GID_DIR_PROGRAM;
         Name	= "mozruntime.zip";
 End
+#endif
+
 #endif
 
 File GID_FILE_HTML_THIRDPARTYLICENSEREADME
Index: moz/zipped/makefile.mk
===================================================================
RCS file: /cvs/external/moz/zipped/makefile.mk,v
retrieving revision 1.7
diff -u -p -u -r1.7 makefile.mk
--- moz/zipped/makefile.mk	14 Aug 2002 16:22:52 -0000	1.7
+++ moz/zipped/makefile.mk	14 Aug 2003 19:52:29 -0000
@@ -71,7 +71,7 @@ TARGET=moz_unzip
 
 # --- Files --------------------------------------------------------
 
-.IF "$(OS)" == "MACOSX"
+.IF "$(OS)" == "MACOSX" || "$(WITH_MOZILLA)" == "NO"
 
 dummy:
 	@echo "Nothing to build for OS $(OS)"