forked from enlightenment/efl
cross compile with iconv may be a bit happier now
SVN revision: 12011
This commit is contained in:
parent
a83169e012
commit
3634ee5b91
|
@ -128,16 +128,18 @@ AC_ARG_ENABLE(ecore-txt,
|
|||
)
|
||||
|
||||
if test "x$have_ecore_txt" = "xyes"; then
|
||||
AC_CHECK_LIB(c, iconv,
|
||||
[
|
||||
AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
|
||||
AM_CONDITIONAL(BUILD_ECORE_TXT, true)
|
||||
ecore_txt_libs="-lecore_txt"
|
||||
], [
|
||||
have_ecore_txt="no"
|
||||
]
|
||||
)
|
||||
|
||||
AC_CHECK_LIB(iconv, libiconv,
|
||||
[
|
||||
AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
|
||||
AM_CONDITIONAL(BUILD_ECORE_TXT, true)
|
||||
iconv_libs="-liconv"
|
||||
ecore_txt_libs="-lecore_txt -liconv"
|
||||
have_ecore_txt="yes"
|
||||
], [
|
||||
have_ecore_txt="no"
|
||||
]
|
||||
)
|
||||
|
||||
if test "x$have_ecore_txt" != "xyes"; then
|
||||
AC_CHECK_LIB(iconv, iconv,
|
||||
[
|
||||
|
@ -166,12 +168,11 @@ if test "x$have_ecore_txt" = "xyes"; then
|
|||
fi
|
||||
|
||||
if test "x$have_ecore_txt" != "xyes"; then
|
||||
AC_CHECK_LIB(iconv, libiconv,
|
||||
AC_CHECK_LIB(c, iconv,
|
||||
[
|
||||
AC_DEFINE(BUILD_ECORE_TXT, 1, [Build Ecore_Txt Module])
|
||||
AM_CONDITIONAL(BUILD_ECORE_TXT, true)
|
||||
iconv_libs="-liconv"
|
||||
ecore_txt_libs="-lecore_txt -liconv"
|
||||
ecore_txt_libs="-lecore_txt"
|
||||
have_ecore_txt="yes"
|
||||
], [
|
||||
AC_MSG_RESULT("no - disabling ecore_txt")
|
||||
|
|
Loading…
Reference in New Issue