Skip to content
Extraits de code Groupes Projets
Valider 4ccb33d4 rédigé par Thomas Goyne's avatar Thomas Goyne
Parcourir les fichiers

Add configure check to verify that boost was built with ICU support

parent 88a36482
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -220,6 +220,23 @@ AX_BOOST_THREAD ...@@ -220,6 +220,23 @@ AX_BOOST_THREAD
PKG_CHECK_MODULES(ICU_UC, icu-uc >= icu_required_version) PKG_CHECK_MODULES(ICU_UC, icu-uc >= icu_required_version)
PKG_CHECK_MODULES(ICU_I18N, icu-i18n >= icu_required_version) PKG_CHECK_MODULES(ICU_I18N, icu-i18n >= icu_required_version)
########
## boost
########
AS_IF([test x$enable_slow_wx_checks != xno], [
AC_AGI_COMPILE([boost ICU support], [boost_icu], [$BOOST_CPPFLAGS],
[$BOOST_LDFLAGS $BOOST_REGEX_LIB $ICU_UC_LIBS $ICU_I18N_LIBS],[
#include <boost/regex/icu.hpp>
int main() {
auto regex = boost::make_u32regex(".", boost::u32regex::perl);
boost::smatch result;
u32regex_search("a", result, regex, boost::match_default);
} ])
AS_IF([test x$agi_cv_with_boost_icu = xno],
[AC_MSG_FAILURE([Aegisub requires that boost be built with ICU support.])])
])
######## ########
## iconv ## iconv
######## ########
...@@ -230,11 +247,8 @@ AS_IF([test -z "$ICONV_LIBS"], AC_SEARCH_LIBS([iconv_open], [iconv])) ...@@ -230,11 +247,8 @@ AS_IF([test -z "$ICONV_LIBS"], AC_SEARCH_LIBS([iconv_open], [iconv]))
AC_AGI_COMPILE([iconv], [iconv], [$ICONV_CFLAGS], [$ICONV_LIBS],[ AC_AGI_COMPILE([iconv], [iconv], [$ICONV_CFLAGS], [$ICONV_LIBS],[
#include <iconv.h> #include <iconv.h>
int main(void) { int main() {
iconv_t ic; return !iconv_open("UTF-8", "UTF-8");
ic = iconv_open ("UTF-8", "UTF-8");
if (!ic) return 1;
return 0;
} ]) } ])
AC_SUBST(ICONV_LIBS) AC_SUBST(ICONV_LIBS)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter