gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

configure.ac: Require ICU 5.0.

Browse source 
ChangeLog: Use tabs in the previous entry.
This commit is contained in:
Ivan Vučica 2019-01-06 20:16:34 +00:00
parent 786c7aa30a
commit a2938b3104
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,9 +1,9 @@
2019-01-06 Ivan Vucica <ivan@vucica.net>
* Tests/base/NSBundle/resources.m:
Fixed change in 2107c82ca4778e4cf9b8624d1bd1fd60fe104373 which made
NSArray *arr become invisible to the "NSBundle GNUstep resources"
test set.
* Tests/base/NSBundle/resources.m:
Fixed change in 2107c82ca4778e4cf9b8624d1bd1fd60fe104373 which made
NSArray *arr become invisible to the "NSBundle GNUstep resources"
test set.
2019-01-06 Ivan Vucica <ivan@vucica.net>
@ -11,6 +11,7 @@
* configure.ac:
Merge the change to use pkg-config to detect ICU. Patch by Hugh
McMaster <hugh.mcmaster@outlook.com>.
Update PR #32 to require ICU 5.0+ and not 4.6+.
* configure:
Regenerated to incorporate the changes from PR #32. Regenerated with
autoconf 2.69.

18
configure vendored
View file

@ -12269,12 +12269,12 @@ if test -n "$ICU_CFLAGS"; then
pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 4.6\""; } >&5
($PKG_CONFIG --exists --print-errors "icu-i18n > 4.6") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 50.0\""; } >&5
($PKG_CONFIG --exists --print-errors "icu-i18n > 50.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n > 4.6" 2>/dev/null`
pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n > 50.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@ -12286,12 +12286,12 @@ if test -n "$ICU_LIBS"; then
pkg_cv_ICU_LIBS="$ICU_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 4.6\""; } >&5
($PKG_CONFIG --exists --print-errors "icu-i18n > 4.6") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 50.0\""; } >&5
($PKG_CONFIG --exists --print-errors "icu-i18n > 50.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n > 4.6" 2>/dev/null`
pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n > 50.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@ -12312,14 +12312,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n > 4.6" 2>&1`
ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n > 50.0" 2>&1`
else
ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n > 4.6" 2>&1`
ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n > 50.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ICU_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (icu-i18n > 4.6) were not met:
as_fn_error $? "Package requirements (icu-i18n > 50.0) were not met:
$ICU_PKG_ERRORS

2
configure.ac
View file

@ -3336,7 +3336,7 @@ AC_ARG_ENABLE(icu,
enable_icu=yes)
if test "$enable_icu" = "yes"; then
PKG_CHECK_MODULES([ICU], [icu-i18n > 4.6])
PKG_CHECK_MODULES([ICU], [icu-i18n > 50.0])
AC_CHECK_HEADERS(unicode/uloc.h unicode/ulocdata.h unicode/ucol.h unicode/ucurr.h unicode/uregex.h unicode/ucal.h unicode/unorm2.h unicode/unum.h unicode/udat.h unicode/udatpg.h unicode/ustring.h unicode/usearch.h unicode/ucnv.h)
LIBS="$LIBS $ICU_LIBS"
HAVE_ICU=1