diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-06-09 23:11:42 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-06-09 23:11:42 +0000 |
| commit | e7e42350a5f83f426ca3986a9ec90fb2ce796ea8 (patch) | |
| tree | 41b65e9a29ebea8af2485ee25588b9c2539b6da8 /rules/libxml2.make | |
| parent | 7595a886825031bc18750e9f3bcda9138164c361 (diff) | |
| download | ptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.gz ptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.xz | |
iconv: rework iconv handling in ptxdist
libiconv provides functionality that is already provided by glibc. So we
consolidate ptxdist to use native glibc iconv instead of libiconv
support.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10681 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libxml2.make')
| -rw-r--r-- | rules/libxml2.make | 14 |
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 |