[Libreoffice-commits] core.git: external/libetonyek

[Tor Lillqvist]

 external/libetonyek/ExternalProject_libetonyek.mk |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 33cf177f6b26a117dac0da4940afd0b2eb03153c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 21 01:18:11 2015 +0300

    Use --disable-shared if DISABLE_DYNLOADING
    
    Change-Id: I77f8890ed6d03f02eb8c12c5e034d119bc85addc

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index acfc76d..23cc2f1 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -28,8 +28,11 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
 			--with-pic \
-			--enable-shared \
-			--disable-static \
+			$(if $(DISABLE_DYNLOADING), \
+				--enable-static --disable-shared \
+			, \
+				--enable-shared --disable-static \
+			) \
 			--without-docs \
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \