diff options
| author | David Tardon <dtardon@redhat.com> | 2011-04-15 16:12:40 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-04-15 16:12:59 +0200 |
| commit | 24ce05abc92722b83c1c047bada5239c771a1c7c (patch) | |
| tree | 9cac8048193a1d483ee56d393488d09c49f61d04 /oox/Library_oox.mk | |
| parent | ab5d2f5768a2465e015de7c88d714a03bfd2d432 (diff) | |
link against openssl correctly
Diffstat (limited to 'oox/Library_oox.mk')
| -rw-r--r-- | oox/Library_oox.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 964ba398d029..db266ba3b814 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)) \ |