forked from enlightenment/efl
parent
2087f9468c
commit
b413db68cd
|
@ -397,12 +397,12 @@ else
|
|||
AC_MSG_RESULT([$iconv_libs])
|
||||
fi
|
||||
|
||||
AM_ICONV
|
||||
if test "x${have_iconv}" = "xno" ; then
|
||||
AC_CHECK_HEADERS([iconv.h], [have_iconv="yes"])
|
||||
|
||||
if test "x${have_iconv}" = "xno" && test "x${am_cv_func_iconv}" = "xyes" ; then
|
||||
iconv_cflags=${LIBICONV}
|
||||
iconv_libs=${LTLIBICONV}
|
||||
have_iconv="yes"
|
||||
if test "x${have_iconv}" = "xyes" ; then
|
||||
AC_SEARCH_LIBS([iconv], [iconv iconv_plug], [], [have_iconv="no"])
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(iconv_cflags)
|
||||
|
@ -419,9 +419,6 @@ else
|
|||
enable_pass_through="no"
|
||||
fi
|
||||
|
||||
AC_MSG_WARN([cp : $enable_chained_pool])
|
||||
AC_MSG_WARN([pt : $enable_pass_through])
|
||||
|
||||
EINA_CHECK_MODULE([chained-pool], [${enable_chained_pool}], [chained pool])
|
||||
EINA_CHECK_MODULE([ememoa-fixed], [${enable_ememoa}], [ememoa fixed])
|
||||
EINA_CHECK_MODULE([ememoa-unknown], [${enable_ememoa}], [ememoa unknown])
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
||||
#ifdef HAVE_ICONV
|
||||
#ifdef HAVE_ICONV_H
|
||||
# include <errno.h>
|
||||
# include <iconv.h>
|
||||
#endif
|
||||
|
@ -356,7 +356,7 @@ eina_str_join_len(char *dst, size_t size, char sep, const char *a, size_t a_len,
|
|||
EAPI char *
|
||||
eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
|
||||
{
|
||||
#ifdef HAVE_ICONV
|
||||
#ifdef HAVE_ICONV_H
|
||||
iconv_t ic;
|
||||
char *new_txt, *inp, *outp;
|
||||
size_t inb, outb, outlen, tob, outalloc;
|
||||
|
|
Loading…
Reference in New Issue