forked from enlightenment/efl
Eina: fix static linking with eina
Fix static linking with eina (iconv could potentially not be passed to the linker) SVN revision: 59914
This commit is contained in:
parent
a7dec51866
commit
3d4c2fb340
|
@ -101,3 +101,8 @@
|
||||||
2011-05-31 Cedric Bail
|
2011-05-31 Cedric Bail
|
||||||
|
|
||||||
* Fix eina_hash_set to handle data == NULL like eina_hash_del.
|
* 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)
|
||||||
|
|
|
@ -482,6 +482,7 @@ AC_ARG_WITH([iconv-link],
|
||||||
[
|
[
|
||||||
LIBS="$withval $LIBS"
|
LIBS="$withval $LIBS"
|
||||||
have_iconv="yes"
|
have_iconv="yes"
|
||||||
|
iconv_libs=$withval
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_MSG_CHECKING(for explicit iconv link options)
|
AC_MSG_CHECKING(for explicit iconv link options)
|
||||||
|
@ -529,7 +530,10 @@ iconv_t ic;
|
||||||
size_t count;
|
size_t count;
|
||||||
count = iconv(ic, NULL, NULL, NULL, NULL);
|
count = iconv(ic, NULL, NULL, NULL, NULL);
|
||||||
]])],
|
]])],
|
||||||
[have_iconv="yes"],
|
[
|
||||||
|
have_iconv="yes"
|
||||||
|
iconv_libs="-liconv"
|
||||||
|
],
|
||||||
[
|
[
|
||||||
have_iconv="no"
|
have_iconv="no"
|
||||||
LIBS=${LIBS_save}
|
LIBS=${LIBS_save}
|
||||||
|
@ -553,7 +557,10 @@ count = iconv(ic, NULL, NULL, NULL, NULL);
|
||||||
iconv_t ic;
|
iconv_t ic;
|
||||||
size_t count = iconv(ic, NULL, NULL, NULL, NULL);
|
size_t count = iconv(ic, NULL, NULL, NULL, NULL);
|
||||||
]])],
|
]])],
|
||||||
[have_iconv="yes"],
|
[
|
||||||
|
have_iconv="yes"
|
||||||
|
iconv_libs="-liconv_plug"
|
||||||
|
],
|
||||||
[
|
[
|
||||||
have_iconv="no"
|
have_iconv="no"
|
||||||
LIBS=${LIBS_save}
|
LIBS=${LIBS_save}
|
||||||
|
@ -563,6 +570,8 @@ size_t count = iconv(ic, NULL, NULL, NULL, NULL);
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST([iconv_libs])
|
||||||
|
|
||||||
if test "x${have_iconv}" = "xyes" ; then
|
if test "x${have_iconv}" = "xyes" ; then
|
||||||
AC_DEFINE([HAVE_ICONV], [1], [Set to 1 if iconv library is installed])
|
AC_DEFINE([HAVE_ICONV], [1], [Set to 1 if iconv library is installed])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -8,5 +8,5 @@ Description: A Library that implements fast data types and miscellaneous tools
|
||||||
@pkgconfig_requires_private@: @requirement_eina@
|
@pkgconfig_requires_private@: @requirement_eina@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -leina
|
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
|
Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
|
||||||
|
|
Loading…
Reference in New Issue