ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Test for additional ICU libraries /usr/lib/libicuuc.a and /usr/lib/libicudata.a.

Browse Source
This commit is contained in:
Scott Bambrough 2006-06-16 10:42:20 -04:00 committed by Alexandre Julliard
parent 705178fb71
commit ee112fc7ad
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -11280,12 +11280,13 @@ fi
if test "$ac_cv_header_unicode_ubidi_h" = "yes" 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}" for i in ${ICU_LIB_DIR-/usr/lib}/libsicu ${ICU_LIB_DIR-/usr/lib}/libicu
ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}" do
ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}" TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}"
{ echo "$as_me:$LINENO: checking whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB" >&5 TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}"
echo $ECHO_N "checking whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB... $ECHO_C" >&6; } { echo "$as_me:$LINENO: checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB" >&5
LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s" echo $ECHO_N "checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB... $ECHO_C" >&6; }
LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -11327,7 +11328,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_ICU 1 #define HAVE_ICU 1
_ACEOF _ACEOF
ICULIBS="$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s" ICULIBS="$TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s"
{ echo "$as_me:$LINENO: result: yes" >&5 { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; } echo "${ECHO_T}yes" >&6; }
@ -11341,6 +11342,7 @@ 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
done
LIBS="$saved_libs" LIBS="$saved_libs"
fi fi

14
configure.ac
View File

@ -602,16 +602,18 @@ dnl **** Check for the ICU library ****
if test "$ac_cv_header_unicode_ubidi_h" = "yes" 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}" for i in ${ICU_LIB_DIR-/usr/lib}/libsicu ${ICU_LIB_DIR-/usr/lib}/libicu
ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}" do
ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}" TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}"
AC_MSG_CHECKING(whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB) TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}"
LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s" AC_MSG_CHECKING(whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB)
LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_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,"$TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s")
AC_MSG_RESULT(yes)], AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
done
LIBS="$saved_libs" LIBS="$saved_libs"
fi fi