summaryrefslogtreecommitdiffstats
path: root/rules/glib.make
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-03-25 16:20:01 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-03-25 16:20:01 +0000
commitd255430b78452943f6bd517b4b79edff3266ef00 (patch)
tree98ed0e2341ca9453c2078dedee2e2a966c39ead9 /rules/glib.make
parenteaf3e81bfcc6f7402515cd21b3b45bc2b539ab4a (diff)
downloadptxdist-d255430b78452943f6bd517b4b79edff3266ef00.tar.gz
ptxdist-d255430b78452943f6bd517b4b79edff3266ef00.tar.xz
[glib] add option to use iconv implementation of c library
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10170 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/glib.make')
-rw-r--r--rules/glib.make14
1 files changed, 6 insertions, 8 deletions
diff --git a/rules/glib.make b/rules/glib.make
index 39784e785..791050ac7 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -56,6 +56,10 @@ GLIB_ENV := \
#
# autoconf
#
+GLIB_AUTOCONF_LIBICONV-$(PTXCONF_GLIB__LIBICONV_CLIB) += no
+GLIB_AUTOCONF_LIBICONV-$(PTXCONF_GLIB__LIBICONV_GNU) += gnu
+GLIB_AUTOCONF_LIBICONV-$(PTXCONF_GLIB__LIBICONV_NATIVE) += native
+
GLIB_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
--enable-threads \
@@ -72,14 +76,8 @@ GLIB_AUTOCONF := \
--disable-fam \
--disable-xattr \
--with-gnu-ld \
- --with-pcre=internal
-
-ifdef PTXCONF_GLIB__LIBICONV_GNU
-GLIB_AUTOCONF += --with-libiconv=gnu
-endif
-ifdef PTXCONF_GLIB__LIBICONV_NATIVE
-GLIB_AUTOCONF += --with-libiconv=native
-endif
+ --with-pcre=internal \
+ --with-libiconv=$(GLIB_AUTOCONF_LIBICONV-y)
# --enable-debug=[no/minimum/yes]
# turn on debugging [default=minimum]