From: László Böszörményi <g...@debian.org>

Let still search for icu-config but use pkg-config method after that.

https://bugs.debian.org/962265
---
 configure.ac | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index cd587b41..b7cab681 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,9 +240,19 @@ if test x$with_icu = xyes; then
           AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_"
           AM_CFLAGS="$AM_CFLAGS -D_ICU_"
        else
-          echo "*** The icu-config script installed by icu could not be found"
-          echo "*** compiling without ICU support"
-          with_icu=no
+          PKG_CHECK_MODULES([ICU], [icu-i18n >= 63.1], [found_icu=yes])
+          if test "$found_icu" = "yes"; then
+             PKG_CHECK_MODULES([ICU_IO], [icu-io >= 63.1])
+             ICU_IOLIBS="$ICU_IO_LIBS"
+             with_icu=yes
+             LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS"
+             AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_"
+             AM_CFLAGS="$AM_CFLAGS -D_ICU_"
+          else
+             echo "*** The icu-config script installed by icu could not be 
found"
+             echo "*** compiling without ICU support"
+             with_icu=no
+          fi
        fi
 fi
 
-- 
2.20.1

_______________________________________________
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Reply via email to