summaryrefslogtreecommitdiffstats
path: root/rules/glib.in
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2009-02-02 12:06:07 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2009-02-02 12:06:07 +0000
commitd8d4d6c67f399e4cbd122fcacd6e3970a7a3bb51 (patch)
tree76439a030d771b3a4eb4c8eac5ecbf1cef54b648 /rules/glib.in
parentcf3cadb8058261bae28b1e2eb5e2daa3ff553cb8 (diff)
downloadptxdist-d8d4d6c67f399e4cbd122fcacd6e3970a7a3bb51.tar.gz
ptxdist-d8d4d6c67f399e4cbd122fcacd6e3970a7a3bb51.tar.xz
* glib: make 2.14 and 2.19 exclusive
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9702 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/glib.in')
-rw-r--r--rules/glib.in16
1 files changed, 15 insertions, 1 deletions
diff --git a/rules/glib.in b/rules/glib.in
index 6b05f2401..e9feccd63 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -2,7 +2,7 @@
menuconfig GLIB
tristate
- prompt "glib 2.14 "
+ prompt "glib "
select LIBICONV if GLIB__LIBICONV_GNU
select GETTEXT if GLIB__GETTEXT_GETTEXT
select GETTEXT_DUMMY if GLIB__GETTEXT_DUMMY
@@ -16,6 +16,20 @@ menuconfig GLIB
if GLIB
choice
+ prompt "version"
+ default GLIB__VERSION_2_19
+
+ config GLIB__VERSION_2_19
+ bool
+ prompt "2.19"
+
+ config GLIB__VERSION_2_14
+ bool
+ prompt "2.14"
+
+endchoice
+
+choice
prompt "iconv variant "
default GLIB__LIBICONV_GNU