diff --git a/build.sh b/build.sh index 8875035a..2b967245 100755 --- a/build.sh +++ b/build.sh @@ -5,8 +5,7 @@ sudo apt-get -q -y update sudo apt-get -q -y upgrade -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 -sudo cp .github/workflows/icu-config /usr/bin/icu-config +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 ./autogen.sh ./configure make diff --git a/configure.ac b/configure.ac index ff5b017c..b579b92f 100644 --- a/configure.ac +++ b/configure.ac @@ -329,9 +329,9 @@ dnl dnl Check for ICU dnl AC_MSG_CHECKING(ICU version) -ICU_MODULE_VERSION="`icu-config --version 2> /dev/null`"; -ICU_MODULE_CFLAGS=" `icu-config --cppflags 2> /dev/null`"; -ICU_MODULE_LIBS="`icu-config --ldflags 2> /dev/null`"; +ICU_MODULE_VERSION="`pkg-config --modversion icu-i18n 2> /dev/null`"; +ICU_MODULE_CFLAGS="`pkg-config --cflags icu-i18n 2> /dev/null`"; +ICU_MODULE_LIBS="`pkg-config --libs icu-i18n 2> /dev/null`"; AC_MSG_RESULT([$ICU_MODULE_VERSION]) if test -z "$ICU_MODULE_VERSION"