[Libreoffice-commits] .: libxslt/makefile.mk

[Libreoffice Gerrit user]

 libxslt/makefile.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit fb0acc2d3ea7c3020d0af869443313cef80710c6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Sep 14 14:13:57 2012 +0300

    Adapt for DISABLE_DYNLOADING instead of just iOS
    
    Change-Id: I7dac78be5a1165ff5cdbd53fd02b907a4fa68a3b

diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 9d4deff..88f7761 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -130,8 +130,10 @@ CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 
-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
+.IF "$(OS)" == "IOS"
 CONFIGURE_ACTION+=LIBS=-liconv
+.ENDIF
 CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static
@@ -166,7 +168,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
 OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
 OUT2BIN_NONE+=xsltproc$/.libs$/xsltproc
 OUT2BIN+=xslt-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
 OUT2LIB+=libxslt$/.libs$/libxslt.a
 OUT2LIB+=libexslt$/.libs$/libexslt.a
 OUT2BIN+=xslt-config