diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2011-11-22 12:55:17 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2011-11-22 12:55:17 +0000 |
| commit | 3b177a54bcd49efc0d8580ad85b9b73ccecdb9eb (patch) | |
| tree | 784ba56be0fccfb91053399a880506a2969dc6f6 /scp2 | |
| parent | 65d79d61a3d2714bfff5b0e9bbf745b95cd0a6c9 (diff) | |
lingucomponent related fixes for i118627, i118628, i118629
* 118627 - Hyphenator: building the UNO component breaks due to name
clash
The three UNO components have been renamed to use the naming scheme
compname.uno: spell.uno, hyphen.uno, lnth.uno
* 118629 - remove hunspell dependency from mythes
hunspell was only needed for building the mythes example.
Added a patch to patch the source in AOO builds and disable the example.
* 118628 - remove hunspell dependency from Hyphenator and Thesaurus UNO
components
The dependency has been remove. Now the three components can be built
independently from each other:
* mythes has a category A license
http://www.apache.org/legal/3party.html#category-a
As a category A license, the library is ENABLED by default and
is built unconditionally if the optional configure switch
--with-system-mythes is missing
As a side effect, building the UNO Thesaurus component is always
enabled.
* hunspell has a category B license
http://www.apache.org/legal/3party.html#category-b
as such, it is DISABLED by default.
To enable the library use --enable-hunspell
To use the library already present in the system instead of building
it, use --with-system-hunspell
As a side effect, building the UNO spell checking component is only
enabled when hunspell is enabled.
* hyphen has a category B license, as such it is DISABLED by default.
To enable the library, use --enable-hyphen
To uses the system library instead of building it, use
--with-system-hyphen
As side effect, building the UNO hyphenator component is only enabled
when hyphen is enabled.
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/source/ooo/file_library_ooo.scp | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index aebedc2df1bd..90ad5c694be9 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1301,7 +1301,7 @@ End File gid_File_Lib_Spell TXT_FILE_BODY; Styles = (PACKED); - Name = LIBNAME(spell); + Name = LIBNAME(spell.uno); Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1414,20 +1414,18 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno) SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) -#ifndef DISABLE_HUNSPELL File gid_File_Lib_Lnth TXT_FILE_BODY; Styles = (PACKED); - Name = LIBNAME(lnth); + Name = LIBNAME(lnth.uno); Dir = SCP2_OOO_BIN_DIR; End -#endif #ifndef DISABLE_HYPHEN File gid_File_Lib_Hyph TXT_FILE_BODY; Styles = (PACKED); - Name = LIBNAME(hyphen); + Name = LIBNAME(hyphen.uno); Dir = SCP2_OOO_BIN_DIR; End #endif diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index ce9b9b725709..958959d85f60 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -194,11 +194,11 @@ SCPDEFS+=-DDISABLE_SAXON SCPDEFS+=-DDISABLE_LIBWPD .ENDIF -.IF "$(DISABLE_HUNSPELL)" == "TRUE" +.IF "$(ENABLE_HUNSPELL)" != "YES" SCPDEFS+=-DDISABLE_HUNSPELL .ENDIF -.IF "$(DISABLE_HYPHEN)" == "TRUE" +.IF "$(ENABLE_HYPHEN)" != "YES" SCPDEFS+=-DDISABLE_HYPHEN .ENDIF |