[Libreoffice-commits] .: oox/Library_oox.mk

[David Tardon]

 oox/Library_oox.mk |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 67e64879e72914ed15b4c3dd7175155079c6a1ae
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 15 16:12:40 2011 +0200

    link against openssl correctly

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 964ba39..db266ba 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -61,11 +61,22 @@ $(eval $(call gb_Library_add_linked_libs,oox,\
     vcl \
     xo \
     xcr \
-    $(if $(filter WNT,$(GUI)),$(if $(filter YES,$(SYSTEM_OPENSSL)),openssl,opensslt)) \
     $(if $(filter SOLARIS,$(OS)),dl nsl socket) \
     $(gb_STDLIBS) \
 ))
 
+ifeq ($(SYSTEM_OPENSSL),YES)
+$(eval $(call gb_Library_add_linked_libs,oox,\
+    crypto \
+    ssl \
+))
+else
+$(eval $(call gb_Library_add_linked_static_libs,oox,\
+    crypto \
+    ssl \
+))
+endif
+
 $(eval $(call gb_Library_set_ldflags,oox,\
 	$$(LDFLAGS) \
 	$(if $(filter YES,$(SYSTEM_OPENSSL)),$(OPENSSL_LIBS)) \