Fix static linking with eina (iconv could potentially not be
passed to the linker)
git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@59914
7cbeb6ba-43b4-40fd-8cce-
4c39aea84d33
2011-05-31 Cedric Bail
* Fix eina_hash_set to handle data == NULL like eina_hash_del.
+
+2011-06-3 Vincent Torri
+
+ * Fix static linking with eina (iconv could potentially not be
+ passed to the linker)
[
LIBS="$withval $LIBS"
have_iconv="yes"
+ iconv_libs=$withval
])
AC_MSG_CHECKING(for explicit iconv link options)
size_t count;
count = iconv(ic, NULL, NULL, NULL, NULL);
]])],
- [have_iconv="yes"],
+ [
+ have_iconv="yes"
+ iconv_libs="-liconv"
+ ],
[
have_iconv="no"
LIBS=${LIBS_save}
iconv_t ic;
size_t count = iconv(ic, NULL, NULL, NULL, NULL);
]])],
- [have_iconv="yes"],
+ [
+ have_iconv="yes"
+ iconv_libs="-liconv_plug"
+ ],
[
have_iconv="no"
LIBS=${LIBS_save}
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
@pkgconfig_requires_private@: @requirement_eina@
Version: @VERSION@
Libs: -L${libdir} -leina
-Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ -ldl
+Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ @iconv_libs@ -ldl
Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina