27 lines
1 KiB
Text
27 lines
1 KiB
Text
|
Index: source/config/icu-config-bottom
|
||
|
|
--- source/config/icu-config-bottom.orig
|
||
|
|
+++ source/config/icu-config-bottom
|
||
|
|
@@ -9,10 +9,10 @@
|
||
|
|
if [ "$MINGW_MOVEDLLSTOBINDIR" = "YES" ]; then
|
||
|
|
ICUUC_FILE="${bindir}/${ICULIBS_COMMON_LIB_NAME}"
|
||
|
|
else
|
||
|
|
- ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}"
|
||
|
|
+ ICUUC_FILE="${ICULIBS_COMMON_LIB_NAME}.*.*"
|
||
|
|
fi
|
||
|
|
|
||
|
|
-ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}"
|
||
|
|
+ICUUC_FILE_A="${ICULIBS_COMMON_LIB_NAME_A}"
|
||
|
|
|
||
|
|
# echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
|
||
|
|
if [ "x$PKGDATA_MODE" = "x" ]; then
|
||
|
|
@@ -104,7 +104,8 @@ usage()
|
||
|
|
## Check the sanity of current variables
|
||
|
|
sanity()
|
||
|
|
{
|
||
|
|
- if [ ! -f "${ICUUC_FILE}" -a ! -f "${ICUUC_FILE_A}" ] && [ ${IGNORE_ICUUC_FILE_CHECK} = "no" ] && [ ${SANITY} = "sane" ];
|
||
|
|
+ libcnt=`find ${libdir} -name ${ICUUC_FILE} -o -name ${ICUUC_FILE_A} | wc -l`
|
||
|
|
+ if [ ${libcnt} -lt 1 ] && [ ${IGNORE_ICUUC_FILE_CHECK} = "no" ] && [ ${SANITY} = "sane" ];
|
||
|
|
then
|
||
|
|
echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2
|
||
|
|
echo "### Try the --prefix= option " 1>&2
|