Skip to content

W
wine-cw
Commit 9f2627e8 authored by Shachar Shemesh's avatar Shachar Shemesh Committed by Alexandre Julliard
Browse files
Options

Static libraries names for ICU are libsicu*.a now.

Add printout of the linking test.
parent a6b405d6
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 5 deletions
configure
View file @ 9f2627e8
...@@ -10334,8 +10334,10 @@ if test "$ac_cv_header_unicode_ubidi_h" = "yes" ...@@ -10334,8 +10334,10 @@ if test "$ac_cv_header_unicode_ubidi_h" = "yes"
then then
saved_libs="$LIBS" saved_libs="$LIBS"
ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}" ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}"
ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}" ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}"
ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}" ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}"
echo "$as_me:$LINENO: checking whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB" >&5
echo $ECHO_N "checking whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB... $ECHO_C" >&6
LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s" LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
...@@ -10380,10 +10382,14 @@ _ACEOF ...@@ -10380,10 +10382,14 @@ _ACEOF
ICULIBS="$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s" ICULIBS="$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
......
configure.ac
View file @ 9f2627e8
...@@ -419,12 +419,15 @@ if test "$ac_cv_header_unicode_ubidi_h" = "yes" ...@@ -419,12 +419,15 @@ if test "$ac_cv_header_unicode_ubidi_h" = "yes"
then then
saved_libs="$LIBS" saved_libs="$LIBS"
ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}" ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}"
ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}" ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}"
ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}" ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}"
AC_MSG_CHECKING(whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB)
LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s" LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()], AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()],
[AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed]) [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed])
AC_SUBST(ICULIBS,"$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s")]) AC_SUBST(ICULIBS,"$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s")
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
LIBS="$saved_libs" LIBS="$saved_libs"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment