[Libreoffice-commits] .: Branch 'libreoffice-3-6' - RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2570fa3ca70a1634b8c45a0b9e796af80616d71f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 9 18:56:26 2012 +0200

    RepositoryExternal: internal libpng requires zlib as well
    
    (cherry picked from commit 398ce44c54b26b31eb826c150926fd49e59b4f52
    and commit f96d58bd53d8068f6056b3f9e45a2b14be5dd4a9
    by Matúš Kukan <matus.kukan at gmail.com>)
    
    Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2
    Reviewed-on: https://gerrit.libreoffice.org/848
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 57b7249..730043c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1104,14 +1104,15 @@ endef
 
 else # !SYSTEM_LIBPNG
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
 	png \
 ))
 
 define gb_LinkTarget__use_png
-$(call gb_LinkTarget_use_libraries,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
 	png \
 )
+$(call gb_LinkTarget__use_zlib,$(1))
 
 endef