This is an automated email from the ASF dual-hosted git repository. drdub pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-uimacpp.git
commit f19263074a5c867ebbefddbcdf054a7cfe4bf431 Author: Pablo Duboue <[email protected]> AuthorDate: Wed Dec 28 07:33:00 2022 -0500 Changes for APR 1.7, ICU using pkg-config and modern JDKs Tested under Debian 11 (bullseye) --- configure.ac | 8 ++++++-- m4/find_icu.m4 | 22 +++++++++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 75b9c92..cb30e82 100644 --- a/configure.ac +++ b/configure.ac @@ -119,8 +119,7 @@ if test $apr_found = "no"; then fi # check APR version number agains regex -#APR_VER_REGEXES=["1\.3\.[0-9] 1\.3\.1[0-9] 1\.4\.[0-9]"] -APR_VER_REGEXES=["1\.4\.[0-9] 1\.5\.[0-9] 1\.6\.[0-9]"] +APR_VER_REGEXES=["1\.4\.[0-9] 1\.5\.[0-9] 1\.6\.[0-9] 1\.7\.[0-9]"] AC_MSG_CHECKING([APR version]) apr_version="`$apr_config --version`" @@ -321,10 +320,15 @@ AC_SUBST(UIMACPP_HOME_LIB) AC_ARG_WITH([jdk], AC_HELP_STRING([--with-jdk], [use local JDK (uses /opt/IBMJava2-142/include by default)]), [UIMA_JDK_INCLUDE="-I$withval" + list="`find "$withval" -type d -print`" + for dir in $list; do + UIMA_JDK_INCLUDE="$UIMA_JDK_INCLUDE -I$dir" + done JDK_TEST_INCLUDE="$UIMA_JDK_INCLUDE"], [UIMA_JDK_INCLUDE="-I/opt/IBMJava2-142/include" JDK_TEST_INCLUDE="-I/opt/IBMJava2-142/include"]) + CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $JDK_TEST_INCLUDE" AC_CHECK_HEADER([jni.h], diff --git a/m4/find_icu.m4 b/m4/find_icu.m4 index 6f1e7a4..efbdbb3 100644 --- a/m4/find_icu.m4 +++ b/m4/find_icu.m4 @@ -31,6 +31,7 @@ AC_DEFUN([ICU_FIND_ICU], [ icu_found="no" + use_pkgconf="no" AC_MSG_CHECKING(for ICU) AC_ARG_WITH(icu, @@ -42,11 +43,13 @@ AC_DEFUN([ICU_FIND_ICU], AC_SUBST(icu_install) else AC_MSG_ERROR([Invalid ICU path $withval]) - fi + fi ], [ dnl Default behavior is implicit yes - if test -d /usr/local/include/unicode ; then + if pkg-config --exists icu-i18n; then + use_pkgconf="yes" + elif test -d /usr/local/include/unicode ; then icu_prefix=/usr/local elif test -d /usr/include/unicode ; then icu_prefix=/usr @@ -57,7 +60,20 @@ AC_DEFUN([ICU_FIND_ICU], icu_found="yes" - if test -x "$icu_prefix/bin/icu-config"; then + if test "$use_pkgconf" = "yes"; then + ICU_VERSION=`pkg-config --modversion icu-i18n` + VERSION_CHECK=`expr $ICU_VERSION \>\= $1` + if test "$VERSION_CHECK" = "1"; then + ICU_CPPFLAGS=`pkg-config --cflags icu-io` + ICU_LDFLAGS=`pkg-config --libs icu-io` + AC_SUBST(ICU_CPPFLAGS) + AC_SUBST(ICU_LDFLAGS) + AC_MSG_RESULT($icu_found) + else + icu_found="no" + AC_MSG_ERROR([Invalid ICU version $ICU_VERSION found. ICU version $1 or higher is required]) + fi + elif test -x "$icu_prefix/bin/icu-config"; then ICU_VERSION=`$icu_prefix/bin/icu-config --prefix=$icu_prefix --version` VERSION_CHECK=`expr $ICU_VERSION \>\= $1` if test "$VERSION_CHECK" = "1"; then
