external/libodfgen/ExternalProject_libodfgen.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef11f552a67abbeaa48fa7dfc676a8a7b6834387
Author: Tor Lillqvist <t...@collabora.com>
Date:   Mon May 26 08:11:38 2014 +0300

    Don't build as shared library when DISABLE_DYNLOADING
    
    Change-Id: Ib3339689d41f02b258f6c398887faae28e602a5c

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index ab430df..c84eb75 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
                export PKG_CONFIG="" \
                && ./configure \
                        --with-pic \
-                       --enable-shared \
+                       $(if $(DISABLE_DYNLOADING),,--enable-shared) \
                        --disable-static \
                        --disable-debug \
                        --disable-werror \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to