Skip to content

Commit 2db929b

Browse files
authored
Replace specifying options for ICU from icu-config to pkg-config (#376)
1 parent d8d72a7 commit 2db929b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
sudo apt-get -q -y update
77
sudo apt-get -q -y upgrade
8-
sudo apt-get -y install build-essential automake autoconf libtool pkg-config libicu66 icu-devtools libicu-dev libxml2-dev uuid-dev fuse libfuse-dev libsnmp-dev
9-
sudo cp .github/workflows/icu-config /usr/bin/icu-config
8+
sudo apt-get -y install build-essential automake autoconf libtool pkg-config icu-devtools libicu-dev libxml2-dev uuid-dev fuse libfuse-dev libsnmp-dev
109
./autogen.sh
1110
./configure
1211
make

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,9 @@ dnl
329329
dnl Check for ICU
330330
dnl
331331
AC_MSG_CHECKING(ICU version)
332-
ICU_MODULE_VERSION="`icu-config --version 2> /dev/null`";
333-
ICU_MODULE_CFLAGS=" `icu-config --cppflags 2> /dev/null`";
334-
ICU_MODULE_LIBS="`icu-config --ldflags 2> /dev/null`";
332+
ICU_MODULE_VERSION="`pkg-config --modversion icu-i18n 2> /dev/null`";
333+
ICU_MODULE_CFLAGS="`pkg-config --cflags icu-i18n 2> /dev/null`";
334+
ICU_MODULE_LIBS="`pkg-config --libs icu-i18n 2> /dev/null`";
335335
AC_MSG_RESULT([$ICU_MODULE_VERSION])
336336

337337
if test -z "$ICU_MODULE_VERSION"

0 commit comments

Comments
 (0)