aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-06-27 15:32:26 +0200
committerMax Kellermann <max@duempel.org>2015-06-27 15:32:26 +0200
commite1e365e16eea5f92bea8919bf1c81d6fc192eea3 (patch)
treebd1a8547552e4c6f82e36b9fc430fe172b9d0ed6 /configure.ac
parent5b5a18db2ac8fef29afcf647ca56aedf59165619 (diff)
downloadmpd-e1e365e16eea5f92bea8919bf1c81d6fc192eea3.tar.gz
mpd-e1e365e16eea5f92bea8919bf1c81d6fc192eea3.tar.xz
mpd-e1e365e16eea5f92bea8919bf1c81d6fc192eea3.zip
configure.ac: add option to disable iconv()
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index a7113d405..e0d437dc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,7 +468,17 @@ AC_ARG_ENABLE(icu,
MPD_AUTO_PKG(icu, ICU, [icu-i18n], [libicu], [libicu not found])
MPD_DEFINE_CONDITIONAL(enable_icu, HAVE_ICU, [libicu])
-if test x$enable_icu != xyes; then
+AC_ARG_ENABLE(iconv,
+ AS_HELP_STRING([--enable-iconv],
+ [enable iconv for character set conversion (default: auto)]),,
+ enable_iconv=yes)
+
+if test x$enable_icu = xyes; then
+ dnl We don't need iconv() if we have libicu
+ enable_iconv=no
+fi
+
+if test x$enable_iconv = xyes; then
AC_CHECK_FUNCS(iconv)
fi