summaryrefslogtreecommitdiffstats
path: root/rules/libxml2.make
diff options
context:
space:
mode:
Diffstat (limited to 'rules/libxml2.make')
-rw-r--r--rules/libxml2.make14
1 files changed, 8 insertions, 6 deletions
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 77002bd78..c781cd48b 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -44,10 +44,18 @@ LIBXML2_ENV := $(CROSS_ENV)
#
# autoconf
#
+# --with-iconv=yes -> does the right thing for libc-iconv
+#
LIBXML2_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--oldincludedir=$(SYSROOT)/usr/include
+ifdef PTXCONF_ICONV
+LIBXML2_AUTOCONF += --with-iconv=yes
+else
+LIBXML2_AUTOCONF += --with-iconv=no
+endif
+
ifdef PTXCONF_LIBXML2_C14N
LIBXML2_AUTOCONF += --with-c14n
else
@@ -102,12 +110,6 @@ else
LIBXML2_AUTOCONF += --without-http
endif
-ifdef PTXCONF_LIBXML2_ICONV
-LIBXML2_AUTOCONF += --with-iconv
-else
-LIBXML2_AUTOCONF += --without-iconv
-endif
-
ifdef PTXCONF_LIBXML2_ISO8859X
LIBXML2_AUTOCONF += --with-iso8859x
else