You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by da...@apache.org on 2018/03/31 08:12:05 UTC

svn commit: r1828086 - /openoffice/trunk/main/RepositoryExternal.mk

Author: damjan
Date: Sat Mar 31 08:12:05 2018
New Revision: 1828086

URL: http://svn.apache.org/viewvc?rev=1828086&view=rev
Log:
Library naming fixes for main/lingucomponent libraries on *nix.

Patch by: me


Modified:
    openoffice/trunk/main/RepositoryExternal.mk

Modified: openoffice/trunk/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryExternal.mk?rev=1828086&r1=1828085&r2=1828086&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryExternal.mk (original)
+++ openoffice/trunk/main/RepositoryExternal.mk Sat Mar 31 08:12:05 2018
@@ -585,7 +585,8 @@ endef
 else # !SYSTEM_LIBTEXTCAT
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-        libtextcat \
+	libtextcat \
+	textcat \
 ))
 
 define gb_LinkTarget__use_libtextcat
@@ -640,7 +641,13 @@ endef
 
 else # !SYSTEM_HUNSPELL
 
+ifeq ($(GUI),WNT)
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,libhunspell))
+else ifeq ($(GUI),OS2)
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,hunspell))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,hunspell-1.3))
+endif
 
 define gb_LinkTarget__use_hunspell
 $(call gb_LinkTarget_set_include,$(1),\
@@ -650,7 +657,13 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DHUNSPELL_STATIC
 )
+ifeq ($(GUI),WNT)
 $(call gb_LinkTarget_add_linked_static_libs,$(1),libhunspell)
+else ifeq ($(GUI),OS2)
+$(call gb_LinkTarget_add_linked_static_libs,$(1),hunspell)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),hunspell-1.3)
+endif
 endef
 
 endif # SYSTEM_HUNSPELL