From 8585861fc3be1574d7a641ef2a8c0feed2fad446 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Sat, 12 Nov 2011 00:31:07 +0200
Subject: Fix iOS fallout from libxml2+libxslt marriage

configure.in nowadays doesn't allow using system libxml2 but internal
libxslt. So remove iOS specifics related to that combination. Keep
building a static library for iOS, though.
---
 libxslt/makefile.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libxslt')

diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 2bec8bdb58ae..cc89185b3ab2 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -134,17 +134,17 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 
 .IF "$(OS)"=="IOS"
-# --with-libxml-prefix actually gives the prefix where bin/xml2-config is looked for,
-# and we want it to find our dummy one that prints the LIBXML_CFLAGS and LIBXML_LIBS that
-# the configure script found out.
-CONFIGURE_FLAGS=--disable-shared --with-libxml-prefix=$(SRC_ROOT)/$(PRJNAME)/dummy
-.ELIF "$(SYSTEM_LIBXML)"!="YES"
-# Use the xml2-config from our own libxml2 copy
-CONFIGURE_FLAGS=--disable-static --with-libxml-prefix=$(SOLARVER)/$(INPATH)
+CONFIGURE_ACTION+=LIBS=-liconv
+CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static
 .ENDIF
 
+.IF "$(SYSTEM_LIBXML)"!="YES"
+# Use the xml2-config from our own libxml2 copy
+CONFIGURE_FLAGS+=--with-libxml-prefix=$(SOLARVER)/$(INPATH)
+.ENDIF
+
 CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes
 
 .IF "$(CROSS_COMPILING)"=="YES"
-- 
cgit