Kaydet (Commit) 8585861f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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.
üst 84349428
...@@ -134,17 +134,17 @@ CONFIGURE_DIR= ...@@ -134,17 +134,17 @@ CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure CONFIGURE_ACTION=.$/configure
.IF "$(OS)"=="IOS" .IF "$(OS)"=="IOS"
# --with-libxml-prefix actually gives the prefix where bin/xml2-config is looked for, CONFIGURE_ACTION+=LIBS=-liconv
# and we want it to find our dummy one that prints the LIBXML_CFLAGS and LIBXML_LIBS that CONFIGURE_FLAGS=--disable-shared
# 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)
.ELSE .ELSE
CONFIGURE_FLAGS=--disable-static CONFIGURE_FLAGS=--disable-static
.ENDIF .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 CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes
.IF "$(CROSS_COMPILING)"=="YES" .IF "$(CROSS_COMPILING)"=="YES"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment