libxml2/makefile.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0cae0cc42864b6f491b048d63eba230da18943d5
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Sep 14 14:15:03 2012 +0300
Adapt for DISABLE_DYNLOADING instead of just iOS
Change-Id: I14d8bd5473197b50457cbdc509c211bba7231802
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 6c7c069..7c47855 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -122,7 +122,7 @@ xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
CONFIGURE_FLAGS=--disable-shared
.ELSE
CONFIGURE_FLAGS=--disable-static
@@ -151,7 +151,7 @@ EXTRPATH=URELIB
OUT2LIB+=.libs$/libxml2.*.dylib
OUT2BIN_NONE+=.libs$/xmllint
OUT2BIN+=xml2-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
OUT2LIB+=.libs$/libxml2.a
OUT2BIN+=xml2-config
.ELIF "$(OS)"=="WNT"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
