mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
Merge pull request #498 from psychon/configure-flag-for-charset
configure: Add --enable/disable-charset
This commit is contained in:
@@ -576,7 +576,11 @@ then
|
||||
LIBS="$my_saved_LIBS"
|
||||
fi
|
||||
|
||||
dnl Wait, what? No --disable flag for this?
|
||||
AC_ARG_ENABLE( [charset],
|
||||
AS_HELP_STRING([--disable-charset], [disable ICU support]),
|
||||
[HAVE_ICU="$enableval"],
|
||||
[HAVE_ICU="auto"])
|
||||
old_HAVE_ICU="$HAVE_ICU"
|
||||
PKG_CHECK_MODULES([icu], [icu-uc], [
|
||||
appendLib "$icu_LIBS"
|
||||
appendCXX "$icu_CFLAGS"
|
||||
@@ -584,6 +588,9 @@ PKG_CHECK_MODULES([icu], [icu-uc], [
|
||||
AC_DEFINE([HAVE_ICU], [1], [Enable ICU library for Unicode handling])
|
||||
AC_DEFINE([U_USING_ICU_NAMESPACE], [0], [Do not clutter global namespace with ICU C++ stuff])
|
||||
], [
|
||||
ZNC_AUTO_FAIL([HAVE_ICU],
|
||||
[support for charset conversion not found. Try --disable-charset.],
|
||||
[support for charset conversion not found and thus disabled])
|
||||
HAVE_ICU="no (icu-uc not found via pkg-config)"
|
||||
])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user