From fe4c47e41febceb4972d79874ccae4704be9b34b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 18 Sep 2012 18:25:29 +0200
Subject: Some clean-up of mork-related changs

And reverted for now the configure error when --enable-mozilla on non-Windows;
it is still used for other features, too.

Change-Id: I1ce5ff1a7a3d140a1ab7ba1e905166d91229c926
---
 scp2/source/ooo/file_library_ooo.scp  | 8 ++------
 scp2/source/ooo/module_hidden_ooo.scp | 5 +----
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'scp2')

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2ee2f0bcc490..13579efbe147 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -892,8 +892,8 @@ End
 
 #if defined(WNT)
 
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
-                                                                // #i91209#
+#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
+
 STD_LIB_FILE(gid_File_Lib_Mozab,mozab2)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
@@ -903,11 +903,7 @@ File gid_File_Lib_Mozbootstrap
     LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
-  #else
     Name = "mozbootstrap.dll";
-  #endif
 End
 
 #endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c265fd9693e8..beedb3b11bd4 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -379,13 +379,10 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Jdbc,
 	gid_File_Lib_Mcnttype,
-#if defined(WNT)
+	gid_File_Lib_Mork,
 	gid_File_Lib_Mozab_2,
 	gid_File_Lib_Mozabdrv,
 	gid_File_Lib_Mozbootstrap,
-#else
-	gid_File_Lib_Mork,
-#endif
 	gid_File_Lib_Mysql,
 	gid_File_Lib_Odbc,
 	gid_File_Lib_Officebean,
-- 
cgit