Skip to content

Commit 66da4df

Browse files
committed
configure: Remove header check for ICU
It wrongly detects old versions of ICU as valid. Checking with pkg-config is sufficient and also sets ICU_UC_LIBS. Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 7be0434 commit 66da4df

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

configure.ac

+1-4
Original file line numberDiff line numberDiff line change
@@ -429,18 +429,15 @@ fi
429429
430430
AM_CONDITIONAL([ENABLE_TRAINING], true)
431431
432-
# Check location of icu headers
432+
# Check availability of ICU packages.
433433
PKG_CHECK_MODULES([ICU_UC], [icu-uc >= 52.1], [have_icu_uc=true], [have_icu_uc=false])
434434
PKG_CHECK_MODULES([ICU_I18N], [icu-i18n >= 52.1], [have_icu_i18n=true], [have_icu_i18n=false])
435435
if !($have_icu_uc && $have_icu_i18n); then
436-
AC_CHECK_HEADERS([unicode/uchar.h], [have_icu=true], [have_icu=false])
437436
if !($have_icu); then
438437
AC_MSG_WARN([icu 52.1 or higher is required, but was not found.])
439438
AC_MSG_WARN([Training tools WILL NOT be built.])
440439
AC_MSG_WARN([Try to install libicu-devel package.])
441440
AM_CONDITIONAL([ENABLE_TRAINING], false)
442-
else
443-
ICU_UC_LIBS="-licui18n -licuuc"
444441
fi
445442
fi
446443

0 commit comments

Comments
 (0)