summaryrefslogtreecommitdiff
path: root/config/companion_libs/libiconv.in
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-03-04 03:13:26 (GMT)
committerGitHub <noreply@github.com>2017-03-04 03:13:26 (GMT)
commitdedfe6905a7e90933097c345be5cbc743b060622 (patch)
tree1e1b040b1b6c7dc02e5ef650e847b0a02a63aff4 /config/companion_libs/libiconv.in
parent0b895560198f61d28af494973bd9ca5181db9970 (diff)
parent69f95de8b030bf03f08ffdd54bac8192a23625e5 (diff)
Merge pull request #630 from stilor/upgrades
Final batch of updates before 1.23
Diffstat (limited to 'config/companion_libs/libiconv.in')
-rw-r--r--config/companion_libs/libiconv.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/companion_libs/libiconv.in b/config/companion_libs/libiconv.in
index 361d34e..d871681 100644
--- a/config/companion_libs/libiconv.in
+++ b/config/companion_libs/libiconv.in
@@ -6,6 +6,10 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config LIBICONV_V_1_15
+ bool
+ prompt "1.15"
+
config LIBICONV_V_1_14
bool
prompt "1.14"
@@ -16,4 +20,5 @@ config LIBICONV_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "1.15" if LIBICONV_V_1_15
default "1.14" if LIBICONV_V_1_14