curl/makefile.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 711fcb41c5adcab3b726624b01834c54398e601e
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Sep 14 14:15:55 2012 +0300
Adapt for DISABLE_DYNLOADING instead of just iOS
Change-Id: I26bc5d87725eb9ae00387e42e9a65ed26a8ec168
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 56775d1..d3da8b3 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -83,7 +83,7 @@ curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
CONFIGURE_DIR=.$/
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=.$/configure
-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
CONFIGURE_FLAGS=--disable-shared
.ELSE
CONFIGURE_FLAGS=--disable-static
@@ -106,7 +106,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
.ELIF "$(OS)"=="ANDROID"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
