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

configure: Only check for the static versions of libicu. 

Get rid of hardcoded path names to avoid trouble on 64-bit platforms.
Based on a patch by Robert Millan.
This commit is contained in:
Alexandre Julliard 2007-05-07 17:06:48 +02:00
parent e2a1bc9804
commit bb168aaba8
2 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
configure vendored
View File

@ -10364,66 +10364,69 @@ 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"
for i in ${ICU_LIB_DIR-/usr/lib}/libsicu ${ICU_LIB_DIR-/usr/lib}/libicu icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s"
do if test -n "$ICU_LIB_DIR"
TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}" then
TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}" icu_libs="-L$ICU_LIB_DIR $icu_libs"
{ echo "$as_me:$LINENO: checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB" >&5 fi
echo $ECHO_N "checking whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB... $ECHO_C" >&6; } { echo "$as_me:$LINENO: checking whether can link with ICU libraries" >&5
LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s" echo $ECHO_N "checking whether can link with ICU libraries... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF LIBS="$saved_libs $icu_libs"
if test "$cross_compiling" = yes; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
cat confdefs.h >>conftest.$ac_ext cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <unicode/ubidi.h> #include <unicode/ubidi.h>
int main () { ubidi_open(); return 0; }
main ()
{
ubidi_open()
;
return 0;
}
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest$ac_exeext
if { (ac_try="$ac_link" if { (ac_try="$ac_link"
case "(($ac_try" in case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;; *) ac_try_echo=$ac_try;;
esac esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1 (eval "$ac_link") 2>&5
ac_status=$? ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
test -z "$ac_c_werror_flag" || { (case "(($ac_try" in
test ! -s conftest.err *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
} && test -s conftest$ac_exeext && *) ac_try_echo=$ac_try;;
$as_test_x conftest$ac_exeext; then esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_ICU 1 #define HAVE_ICU 1
_ACEOF _ACEOF
ICULIBS="$TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s" ICULIBS="icu_libs"
{ echo "$as_me:$LINENO: result: yes" >&5 { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; } echo "${ECHO_T}yes" >&6; }
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: program exited with status $ac_status" >&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 ( exit $ac_status )
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; } echo "${ECHO_T}no" >&6; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
done
LIBS="$saved_libs" LIBS="$saved_libs"
fi fi

25
configure.ac
View File

@ -593,18 +593,19 @@ 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"
for i in ${ICU_LIB_DIR-/usr/lib}/libsicu ${ICU_LIB_DIR-/usr/lib}/libicu icu_libs="-lsicuuc -lsicudata -lstdc++ -lgcc_s"
do if test -n "$ICU_LIB_DIR"
TEST_ICUUC_LIB="${ICUUC_LIB-${i}uc.a}" then
TEST_ICUDATA_LIB="${ICUDATA_LIB-${i}data.a}" icu_libs="-L$ICU_LIB_DIR $icu_libs"
AC_MSG_CHECKING(whether can link with ICU libraries $TEST_ICUUC_LIB and $TEST_ICUDATA_LIB) fi
LIBS="$saved_libs $TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s" AC_MSG_CHECKING(whether can link with ICU libraries)
AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()], LIBS="$saved_libs $icu_libs"
[AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed]) AC_TRY_RUN([#include <unicode/ubidi.h>
AC_SUBST(ICULIBS,"$TEST_ICUUC_LIB $TEST_ICUDATA_LIB -lstdc++ -lgcc_s") main () { ubidi_open(); return 0; }],
AC_MSG_RESULT(yes)], [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed])
[AC_MSG_RESULT(no)]) AC_SUBST(ICULIBS,"icu_libs")
done AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
LIBS="$saved_libs" LIBS="$saved_libs"
fi fi