bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

on some platform, iconv.h defines iconv() with a macro, 

hence the check with AC_SEARCH_LIBS s not sufficient. So
we link a complete program.


SVN revision: 45981
This commit is contained in:
Vincent Torri 2010-02-08 13:14:30 +00:00
parent d52b70b3b7
commit 8840ed4118
2 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
legacy/eina/configure.ac
View File

@ -364,12 +364,11 @@ AC_SUBST(dlopen_libs)
EFL_CHECK_FNMATCH([], [AC_MSG_ERROR([Cannot find fnmatch()])])
# iconv library
iconv_libs=""
have_iconv="no"
AC_ARG_WITH([iconv-link],
AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]),
[
iconv_libs=$withval
LIBS="$withval $LIBS"
have_iconv="yes"
])
@ -384,12 +383,66 @@ if test "x${have_iconv}" = "xno" ; then
AC_CHECK_HEADERS([iconv.h], [have_iconv="yes"])
if test "x${have_iconv}" = "xyes" ; then
AC_SEARCH_LIBS([iconv], [iconv iconv_plug], [], [have_iconv="no"])
AC_MSG_CHECKING([whether iconv() is in libc])
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <iconv.h>
]],
[[
iconv_t ic;
size_t count = iconv(ic, NULL, NULL, NULL, NULL);
]])],
[have_iconv="yes"],
[have_iconv="no"])
AC_MSG_RESULT([${have_iconv}])
fi
if test "x${have_iconv}" = "xno" ; then
AC_MSG_CHECKING([whether iconv() is in libiconv.a])
LIBS_save="${LIBS}"
LIBS="-liconv $LIBS"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <iconv.h>
]],
[[
iconv_t ic;
size_t count;
count = iconv(ic, NULL, NULL, NULL, NULL);
]])],
[have_iconv="yes"],
[have_iconv="no"])
AC_MSG_RESULT([${have_iconv}])
fi
if test "x${have_iconv}" = "xno" ; then
AC_MSG_CHECKING([whether iconv() is in libiconv_plug.a])
LIBS_save="${LIBS}"
LIBS="-liconv_plug $LIBS"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <iconv.h>
]],
[[
iconv_t ic;
size_t count = iconv(ic, NULL, NULL, NULL, NULL);
]])],
[have_iconv="yes"],
[have_iconv="no"])
LDFLAGS="${LDFLAGS_save}"
AC_MSG_RESULT([${have_iconv}])
fi
fi
AC_SUBST(iconv_libs)
if test "x${have_iconv}" = "xyes" ; then
AC_DEFINE([HAVE_ICONV], [1], [Set to 1 if iconv library is installed])
fi

2
legacy/eina/src/lib/Makefile.am
View File

@ -127,7 +127,7 @@ else
libeina_la_SOURCES = $(base_sources)
endif
libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ @iconv_libs@
libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@
libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@