mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve configure error for ICU libraries if pkg-config is absent.

Browse Source 
If pkg-config is not installed, the ICU libraries cannot be found, but
the custom configure error message did not mention this. This might
lead to confusion about the actual problem. To improve this, remove
the explicit error message and rely on PKG_CHECK_MODULES' generic
error message.

Author: Michael Banck
Reported-by: Holger Jakobs
Discussion: https://postgr.es/m/ccd579ed-4949-d3de-ab13-9e6456fd2caf%40jakobs.com
Discussion: https://postgr.es/m/66b5d05c.050a0220.7c8ce.a951@mx.google.com
This commit is contained in:
Jeff Davis 2024-08-20 11:24:00 -07:00
parent 5ff9b6b4d9
commit 0fb0f68933
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@ -8153,17 +8153,31 @@ fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs
echo "$ICU_PKG_ERRORS" >&5 echo "$ICU_PKG_ERRORS" >&5
as_fn_error $? "ICU library not found as_fn_error $? "Package requirements (icu-uc icu-i18n) were not met:
If you have ICU already installed, see config.log for details on the
failure. It is possible the compiler isn't looking in the proper directory. $ICU_PKG_ERRORS
Use --without-icu to disable ICU support." "$LINENO" 5
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables ICU_CFLAGS
and ICU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
as_fn_error $? "ICU library not found { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
If you have ICU already installed, see config.log for details on the $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
failure. It is possible the compiler isn't looking in the proper directory. as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
Use --without-icu to disable ICU support." "$LINENO" 5 is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables ICU_CFLAGS
and ICU_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else else
ICU_CFLAGS=$pkg_cv_ICU_CFLAGS ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
ICU_LIBS=$pkg_cv_ICU_LIBS ICU_LIBS=$pkg_cv_ICU_LIBS

6
configure.ac
View File

@ -829,11 +829,7 @@ AC_MSG_RESULT([$with_icu])
AC_SUBST(with_icu) AC_SUBST(with_icu)
if test "$with_icu" = yes; then if test "$with_icu" = yes; then
PKG_CHECK_MODULES(ICU, icu-uc icu-i18n, [], PKG_CHECK_MODULES(ICU, icu-uc icu-i18n)
[AC_MSG_ERROR([ICU library not found
If you have ICU already installed, see config.log for details on the
failure. It is possible the compiler isn't looking in the proper directory.
Use --without-icu to disable ICU support.])])
fi fi
# #