summaryrefslogtreecommitdiffstats
path: root/rules/mplayer.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2009-06-09 23:11:42 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2009-06-09 23:11:42 +0000
commite7e42350a5f83f426ca3986a9ec90fb2ce796ea8 (patch)
tree41b65e9a29ebea8af2485ee25588b9c2539b6da8 /rules/mplayer.make
parent7595a886825031bc18750e9f3bcda9138164c361 (diff)
downloadptxdist-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/mplayer.make')
-rw-r--r--rules/mplayer.make8
1 files changed, 7 insertions, 1 deletions
diff --git a/rules/mplayer.make b/rules/mplayer.make
index f4ffa718d..4da80b474 100644
--- a/rules/mplayer.make
+++ b/rules/mplayer.make
@@ -84,6 +84,13 @@ MPLAYER_AUTOCONF := \
--with-extraincdir=$(SYSROOT)/include \
--with-extralibdir=$(SYSROOT)/lib \
--extra-libs='-Wl,-rpath-link -Wl,$(strip $(SYSROOT))/usr/lib'
+
+ifdef PTXCONF_ICONV
+MPLAYER_AUTOCONF += --enable-iconv
+else
+MPLAYER_AUTOCONF += --disable-iconv
+endif
+
#
# video out
#
@@ -137,7 +144,6 @@ MPLAYER_AUTOCONF += \
--disable-linux-devfs \
--disable-termcap \
--disable-termios \
- --disable-iconv \
--disable-langinfo \
--disable-lirc \
--disable-lircc \