If the internal hyphen library is used which does not build a shared object, then link to $(SOLARLIBDIR)/libhyphen.a, instead of using -lhyphen on UNX + GCC. --- .../hyphenator/altlinuxhyph/hyphen/makefile.mk | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk index f3626c7..3e002a4 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk @@ -32,10 +32,12 @@ TARGET = hyphen_lib ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE -.IF "$(GUI)"=="OS2" -HNJLIB=hyphen.lib -.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC" +.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC" +.IF "$(SYSTEM_HYPH)"=="NO" +HNJLIB=$(SOLARLIBDIR)/libhyphen.a +.ELSE HNJLIB=-lhyphen +.ENDIF .ELSE HNJLIB=hyphen.lib .ENDIF -- 1.7.3.1 _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
