[Libreoffice-commits] .: scp2/InstallModule_ooo.mk scp2/source

[Libreoffice Gerrit user]

 scp2/InstallModule_ooo.mk            |    5 +----
 scp2/source/ooo/file_library_ooo.scp |    4 ++--
 scp2/source/ooo/file_ooo.scp         |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit a75a79e32718f98bf1f84199c944a831bec75a6a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 4 13:57:53 2012 +0100

    Adapt scp2 to WITH_MOZAB4WIN
    
    Change-Id: Ibef1ceb454eafba7129c774b8ced8c743ea3ce3d

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 23fbb67..13413a1 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_LIBXSLT \
 	SYSTEM_LPSOLVE \
 	SYSTEM_LUCENE \
-	SYSTEM_MOZILLA \
 	SYSTEM_MYTHES \
 	SYSTEM_NEON \
 	SYSTEM_NSS \
@@ -77,6 +76,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_REDLAND \
 	SYSTEM_SNDFILE \
 	SYSTEM_STDLIBS \
+	WITH_MOZAB4WIN \
 ))
 
 $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
@@ -149,9 +149,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	$(if $(filter YES,$(SYSTEM_HSQLDB)),\
 		-DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
 	) \
-	$(if $(filter-out YES,$(WITH_MOZILLA)),\
-		-DWITHOUT_MOZILLA \
-	) \
 	$(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\
 		-DWITHOUT_MYSPELL_DICTS \
 	) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6141f0e..8e94377 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -827,7 +827,7 @@ End
 
 #if defined(WNT)
 
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+#if defined WITH_MOZAB4WIN
 
 STD_LIB_FILE(gid_File_Lib_Mozab,mozab2)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
@@ -1565,7 +1565,7 @@ File gid_File_Lib_Unopkgapp
     Styles = (PACKED);
 End
 
-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
+#if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
         // gid_Brand_File_Lib_Msvcr80
 File gid_File_Moz_Msvcp80
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6b30e72..c4b48d1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -610,7 +610,7 @@ File gid_File_Mod_Text
     Name = "text.mod";
 End
 
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) 
+#if defined WITH_MOZAB4WIN
 
 File gid_File_Mozilla_Runtime
     TXT_FILE_BODY;