MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-17 17:38:22 +02:00
Code Issues Releases Wiki Activity

configure: Fix conditions for compiling libicu dependent units. (fixes #165)

Browse source
This commit is contained in:
Jason Volk 2020-09-23 17:10:03 -07:00
parent 236fd361e5
commit 25cd479a7c
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -1419,13 +1419,16 @@ dnl RB_CHK_SYSHEADER(unicode/idna.h, [UNICODE_IDNA_H])
dnl RB_CHK_SYSHEADER(unicode/utmscale.h, [UNICODE_UTMSCALE_H]) dnl RB_CHK_SYSHEADER(unicode/utmscale.h, [UNICODE_UTMSCALE_H])
have_icu="no"
PKG_CHECK_MODULES(icuuc, [icuuc], PKG_CHECK_MODULES(icuuc, [icuuc],
[ [
have_icu="yes"
have_icuuc="yes" have_icuuc="yes"
ICU_LIBS+=" -licuuc" ICU_LIBS+=" -licuuc"
], [ ], [
AC_CHECK_LIB([icuuc], [_init], AC_CHECK_LIB([icuuc], [_init],
[ [
have_icu="yes"
have_icuuc="yes" have_icuuc="yes"
ICU_LIBS+=" -licuuc" ICU_LIBS+=" -licuuc"
], [ ], [
@ -1434,6 +1437,7 @@ PKG_CHECK_MODULES(icuuc, [icuuc],
]) ])
AM_CONDITIONAL([ICUUC], [test "x$have_icuuc" = "xyes" ]) AM_CONDITIONAL([ICUUC], [test "x$have_icuuc" = "xyes" ])
AM_CONDITIONAL([ICU], [test "x$have_icu" = "xyes" ])
dnl dnl
dnl dnl

2
ircd/Makefile.am
View file

@ -129,7 +129,9 @@ libircd_la_SOURCES += demangle.cc
libircd_la_SOURCES += backtrace.cc libircd_la_SOURCES += backtrace.cc
libircd_la_SOURCES += simd.cc libircd_la_SOURCES += simd.cc
libircd_la_SOURCES += fpe.cc libircd_la_SOURCES += fpe.cc
if ICU
libircd_la_SOURCES += icu.cc libircd_la_SOURCES += icu.cc
endif
libircd_la_SOURCES += utf.cc libircd_la_SOURCES += utf.cc
libircd_la_SOURCES += timedate.cc libircd_la_SOURCES += timedate.cc
libircd_la_SOURCES += lex_cast.cc libircd_la_SOURCES += lex_cast.cc