diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 18:25:29 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 18:26:42 +0200 |
| commit | fe4c47e41febceb4972d79874ccae4704be9b34b (patch) | |
| tree | 985b18a19812c8e572824f8a011cf380a54b405a /scp2/source | |
| parent | 64d1fcb11f4915df960ec81bc9168a557199090f (diff) | |
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
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 5 |
2 files changed, 3 insertions, 10 deletions
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, |