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

[Tor Lillqvist]

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

New commits:
commit 9444a1ffccadcc41d5e3f7519d870392dcbaf19d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 26 08:23:17 2014 +0300

    Let's make it fully clear what we want
    
    Change-Id: Idfd73565c29c4ebcf561955fa965a81888a59315

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index c84eb75..263e60d 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -27,8 +27,11 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
 		export PKG_CONFIG="" \
 		&& ./configure \
 			--with-pic \
-			$(if $(DISABLE_DYNLOADING),,--enable-shared) \
-			--disable-static \
+			$(if $(DISABLE_DYNLOADING), \
+				--enable-static --disable-shared \
+			, \
+				--enable-shared --disable-static \
+			) \
 			--disable-debug \
 			--disable-werror \
 			--disable-weffc \